[csw-devel] SF.net SVN: gar:[16015] csw/mgar/pkg/lang-python/pygobject/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 27 14:44:45 CEST 2011
Revision: 16015
http://gar.svn.sourceforge.net/gar/?rev=16015&view=rev
Author: dmichelsen
Date: 2011-10-27 12:44:44 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
lang-python/pygobject/trunk: Rework packages, compile against glib 2.22
Modified Paths:
--------------
csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh
csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff
Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2011-10-27 07:32:35 UTC (rev 16014)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2011-10-27 12:44:44 UTC (rev 16015)
@@ -11,33 +11,38 @@
MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(RELVER)/
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-STRIP_LIBTOOL = 1
+PATCHFILES = 0001-forcing-lglib-2.0.patch
-PACKAGES = CSWpy-gobject-devel CSWpy-gobject CSWlibpyglib-2-0-py0
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-CATALOGNAME_CSWpy-gobject = py_gobject
+PACKAGES += CSWpy-gobject
SPKG_DESC_CSWpy-gobject = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWpy-gobject = CSWpython CSWggettextrt CSWglib2
+PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.*
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWpython
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWglib2
+RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibintl8
RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-2-0-py0
-INCOMPATIBLE_PKGS_CSWpy-gobject = CSWpygobject
-PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.*
+OBSOLETED_BY_CSWpy-gobject = CSWpygobject
+PACKAGES += CSWlibpyglib-2-0-py0
SPKG_DESC_CSWlibpyglib-2-0-py0 = Runtime library for the Python GObject library
-CATALOGNAME_CSWlibpyglib-2-0-py0 = libpyglib_2_0_py0
PKGFILES_CSWlibpyglib-2-0-py0 = $(libdir)/libpyglib-2.0-python.so.0.*
-RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 = CSWggettextrt CSWglib2
-
+RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibpyglib-2-0-py0 += CSWlibintl8
# soname results in a package name that is too long so it was shortened
-CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpyglib-2.0-python.so.0.0.0|soname=libpyglib-2.0-python.so.0|pkgname=CSWlibpyglib-2-0-py0|expected=['CSWlibpyglib-2-0-python0',|'CSWlibpyglib-2-0-python-0']
-SPKG_DESC_CSWpy-gobject-devel = Development files for the Python GObject library
-CATALOGNAME_CSWpy-gobject-devel = py_gobject_devel
-RUNTIME_DEP_PKGS_CSWpy-gobject-devel = CSWpython
+CHECKPKG_OVERRIDES_CSWlibpyglib-2-0-py0 += shared-lib-pkgname-mismatch
-PYCOMPILE = 1
+PACKAGES += CSWpy-gobject-dev
+SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-2-0-py0
+RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWpython
-PATCHFILES = 0001-forcing-lglib-2.0.patch
+# These are just comments
+CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/defsgen.py
+CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/h2def.py
-EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
+PYCOMPILE = 1
+STRIP_LIBTOOL = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --without-ffi
@@ -46,4 +51,6 @@
TEST_TARGET = check
TEST_SCRIPTS =
+EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
+
include gar/category.mk
Deleted: csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh 2011-10-27 07:32:35 UTC (rev 16014)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/files/fixme.sh 2011-10-27 12:44:44 UTC (rev 16015)
@@ -1,49 +0,0 @@
-#!/bin/bash
-####################################################
-#
-# fixme.sh
-# Intended to remove the use of libtool's
-# pseudo-libraries for opencsw builds.
-#
-# Author: Mike Watters mwatters_at_opencsw.org
-# Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
- gecho "USAGE: $(basename $0) WORKSRC"
- exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \
- gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
- for file in ${LT_FILES}; do
- LIB_NAME=$(ggrep 'dlname=' ${file} | \
- gsed -e "s/.*'\(.*\)'/\1/" \
- -e "s/^lib//" \
- -e "s/\.so.*$//")
- fixpath=$(gecho $file |gsed 's/\//\\\//g')
- sed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
- gmv Makefile.new ${mk}
- done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
- gmv ${lt}.new ${lt}
-done
-
-LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
-if [ -f ${LTMAIN} ]; then
- gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
- gmv ${LTMAIN}.new ${LTMAIN}
-fi
-
Deleted: csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff 2011-10-27 07:32:35 UTC (rev 16014)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/files/pygobject.diff 2011-10-27 12:44:44 UTC (rev 16015)
@@ -1,13 +0,0 @@
---- pygobject-2.15.4/gobject/pygobject.c.orig 2009-02-22 20:17:01.681808089 -0600
-+++ pygobject-2.15.4/gobject/pygobject.c 2009-02-22 20:19:53.769734218 -0600
-@@ -419,7 +419,9 @@
- 0
- };
-
--struct empty {} _empty;
-+struct empty {
-+ int* p;
-+} _empty;
- PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, _empty);
-
- static PyObject *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list