diff options
| -rw-r--r-- | devel/py-gobject-shared/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-gobject/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-gobject/Makefile.common | 7 | ||||
| -rw-r--r-- | devel/py-gobject/PLIST | 51 | ||||
| -rw-r--r-- | devel/py-gobject/distinfo | 13 | ||||
| -rw-r--r-- | devel/py-gobject/patches/patch-aa | 10 | ||||
| -rw-r--r-- | devel/py-gobject/patches/patch-ab | 8 | ||||
| -rw-r--r-- | devel/py-gobject/patches/patch-ad | 13 |
8 files changed, 72 insertions, 38 deletions
diff --git a/devel/py-gobject-shared/Makefile b/devel/py-gobject-shared/Makefile index 057718e8475..494957c1bd0 100644 --- a/devel/py-gobject-shared/Makefile +++ b/devel/py-gobject-shared/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2009/02/22 13:59:47 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2009/06/09 13:25:02 wiz Exp $ -PKGNAME= py-gobject-shared-2.16.1 +PKGNAME= py-gobject-shared-2.18.0 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index 35769dca441..f1821d06c9e 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2009/02/22 13:59:47 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2009/06/09 13:25:02 wiz Exp $ # -PKGNAME= ${PYPKGPREFIX}-gobject-2.16.1 +PKGNAME= ${PYPKGPREFIX}-gobject-2.18.0 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common index 8a8295f317a..1d2070d6db3 100644 --- a/devel/py-gobject/Makefile.common +++ b/devel/py-gobject/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.12 2009/02/22 13:59:47 wiz Exp $ +# $NetBSD: Makefile.common,v 1.13 2009/06/09 13:25:02 wiz Exp $ # # used by devel/py-gobject/Makefile # used by devel/py-gobject-shared/Makefile -DISTNAME= pygobject-2.16.1 +DISTNAME= pygobject-2.18.0 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/2.16/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/2.18/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.pygtk.org/ @@ -22,4 +22,5 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/py-gobject/distinfo PKGCONFIG_OVERRIDE+= pygobject-2.0.pc.in PY_PATCHPLIST= yes +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4 diff --git a/devel/py-gobject/PLIST b/devel/py-gobject/PLIST index 18968a58e7d..5288f3bdc6b 100644 --- a/devel/py-gobject/PLIST +++ b/devel/py-gobject/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2008/10/16 13:52:05 drochner Exp $ +@comment $NetBSD: PLIST,v 1.8 2009/06/09 13:25:02 wiz Exp $ bin/pygobject-codegen-2.0 include/pygtk-2.0/pyglib.h -lib/libpyglib-2.0.la +lib/libpyglib-2.0-python${PYVERSSUFFIX}.la ${PYSITELIB}/gtk-2.0/dsextras.py ${PYSITELIB}/gtk-2.0/dsextras.pyc ${PYSITELIB}/gtk-2.0/dsextras.pyo @@ -31,12 +31,39 @@ ${PYSITELIB}/pygtk.pth ${PYSITELIB}/pygtk.py ${PYSITELIB}/pygtk.pyc ${PYSITELIB}/pygtk.pyo +share/gtk-doc/html/pygobject/class-gioappinfo.html +share/gtk-doc/html/pygobject/class-gioapplaunchcontext.html +share/gtk-doc/html/pygobject/class-gioasyncresult.html +share/gtk-doc/html/pygobject/class-giocancellable.html +share/gtk-doc/html/pygobject/class-giodrive.html +share/gtk-doc/html/pygobject/class-gioemblem.html +share/gtk-doc/html/pygobject/class-gioemblemedicon.html +share/gtk-doc/html/pygobject/class-giofile.html +share/gtk-doc/html/pygobject/class-giofileattributeinfo.html +share/gtk-doc/html/pygobject/class-giofileenumerator.html +share/gtk-doc/html/pygobject/class-giofileicon.html +share/gtk-doc/html/pygobject/class-giofileinfo.html +share/gtk-doc/html/pygobject/class-giofilemonitor.html +share/gtk-doc/html/pygobject/class-gioicon.html +share/gtk-doc/html/pygobject/class-gioinputstream.html +share/gtk-doc/html/pygobject/class-gioloadableicon.html +share/gtk-doc/html/pygobject/class-giomount.html +share/gtk-doc/html/pygobject/class-giomountoperation.html +share/gtk-doc/html/pygobject/class-giooutputstream.html +share/gtk-doc/html/pygobject/class-gioseekable.html +share/gtk-doc/html/pygobject/class-giosimpleasyncresult.html +share/gtk-doc/html/pygobject/class-giothemedicon.html +share/gtk-doc/html/pygobject/class-giovolume.html +share/gtk-doc/html/pygobject/class-giovolumemonitor.html share/gtk-doc/html/pygobject/class-glibmaincontext.html share/gtk-doc/html/pygobject/class-glibmainloop.html share/gtk-doc/html/pygobject/class-gobject.html share/gtk-doc/html/pygobject/class-gobjectgboxed.html share/gtk-doc/html/pygobject/class-gobjectginterface.html share/gtk-doc/html/pygobject/class-gobjectgpointer.html +share/gtk-doc/html/pygobject/gio-class-reference.html +share/gtk-doc/html/pygobject/gio-constants.html +share/gtk-doc/html/pygobject/glib-class-reference.html share/gtk-doc/html/pygobject/glib-constants.html share/gtk-doc/html/pygobject/glib-functions.html share/gtk-doc/html/pygobject/gobject-class-reference.html @@ -53,6 +80,9 @@ share/pygobject/2.0/codegen/__init__.pyo share/pygobject/2.0/codegen/argtypes.py share/pygobject/2.0/codegen/argtypes.pyc share/pygobject/2.0/codegen/argtypes.pyo +share/pygobject/2.0/codegen/code-coverage.py +share/pygobject/2.0/codegen/code-coverage.pyc +share/pygobject/2.0/codegen/code-coverage.pyo share/pygobject/2.0/codegen/codegen.py share/pygobject/2.0/codegen/codegen.pyc share/pygobject/2.0/codegen/codegen.pyo @@ -62,12 +92,21 @@ share/pygobject/2.0/codegen/createdefs.pyo share/pygobject/2.0/codegen/definitions.py share/pygobject/2.0/codegen/definitions.pyc share/pygobject/2.0/codegen/definitions.pyo +share/pygobject/2.0/codegen/defsconvert.py +share/pygobject/2.0/codegen/defsconvert.pyc +share/pygobject/2.0/codegen/defsconvert.pyo +share/pygobject/2.0/codegen/defsgen.py +share/pygobject/2.0/codegen/defsgen.pyc +share/pygobject/2.0/codegen/defsgen.pyo share/pygobject/2.0/codegen/defsparser.py share/pygobject/2.0/codegen/defsparser.pyc share/pygobject/2.0/codegen/defsparser.pyo share/pygobject/2.0/codegen/docextract.py share/pygobject/2.0/codegen/docextract.pyc share/pygobject/2.0/codegen/docextract.pyo +share/pygobject/2.0/codegen/docextract_to_xml.py +share/pygobject/2.0/codegen/docextract_to_xml.pyc +share/pygobject/2.0/codegen/docextract_to_xml.pyo share/pygobject/2.0/codegen/docgen.py share/pygobject/2.0/codegen/docgen.pyc share/pygobject/2.0/codegen/docgen.pyo @@ -77,6 +116,9 @@ share/pygobject/2.0/codegen/h2def.pyo share/pygobject/2.0/codegen/mergedefs.py share/pygobject/2.0/codegen/mergedefs.pyc share/pygobject/2.0/codegen/mergedefs.pyo +share/pygobject/2.0/codegen/missingdefs.py +share/pygobject/2.0/codegen/missingdefs.pyc +share/pygobject/2.0/codegen/missingdefs.pyo share/pygobject/2.0/codegen/mkskel.py share/pygobject/2.0/codegen/mkskel.pyc share/pygobject/2.0/codegen/mkskel.pyo @@ -86,11 +128,15 @@ share/pygobject/2.0/codegen/override.pyo share/pygobject/2.0/codegen/reversewrapper.py share/pygobject/2.0/codegen/reversewrapper.pyc share/pygobject/2.0/codegen/reversewrapper.pyo +share/pygobject/2.0/codegen/scanvirtuals.py +share/pygobject/2.0/codegen/scanvirtuals.pyc +share/pygobject/2.0/codegen/scanvirtuals.pyo share/pygobject/2.0/codegen/scmexpr.py share/pygobject/2.0/codegen/scmexpr.pyc share/pygobject/2.0/codegen/scmexpr.pyo share/pygobject/2.0/defs/gappinfo.override share/pygobject/2.0/defs/gapplaunchcontext.override +share/pygobject/2.0/defs/gdrive.override share/pygobject/2.0/defs/gfile.override share/pygobject/2.0/defs/gfileattribute.override share/pygobject/2.0/defs/gfileenumerator.override @@ -100,6 +146,7 @@ share/pygobject/2.0/defs/ginputstream.override share/pygobject/2.0/defs/gio-types.defs share/pygobject/2.0/defs/gio.defs share/pygobject/2.0/defs/gio.override +share/pygobject/2.0/defs/gmount.override share/pygobject/2.0/defs/goutputstream.override share/pygobject/2.0/defs/gvolume.override share/pygobject/2.0/defs/gvolumemonitor.override diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 6b35ac42398..9f3f5be80a9 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.15 2009/02/22 13:59:47 wiz Exp $ +$NetBSD: distinfo,v 1.16 2009/06/09 13:25:02 wiz Exp $ -SHA1 (pygobject-2.16.1.tar.gz) = 5c073d4de859f4455a4d0bd60617a254d18d99e3 -RMD160 (pygobject-2.16.1.tar.gz) = a5e0919848abe0a538a3729e41c7f3e1f2be6a37 -Size (pygobject-2.16.1.tar.gz) = 644722 bytes -SHA1 (patch-aa) = 7017840985a985ef92ec8983dd8f4d8763c38ed3 -SHA1 (patch-ab) = 6e547a4e1fdfc7e6754805f9bc1244bbcf13a916 +SHA1 (pygobject-2.18.0.tar.gz) = a9e2d4f3b3daa8da482408feecf3a2a9ed7d07ea +RMD160 (pygobject-2.18.0.tar.gz) = 67308ee082f5d8291b03feeb13e09c7f39a697d2 +Size (pygobject-2.18.0.tar.gz) = 823544 bytes +SHA1 (patch-aa) = a706cc4cd48121f21d12027c315dfe92d34157ed +SHA1 (patch-ab) = cda1c31ff28c40bbd5b7190d765e80376d9d9626 SHA1 (patch-ac) = a2353cb390ab1d85483ec15b1c07c3a9e3373567 -SHA1 (patch-ad) = 3f8e9dd03c531198c1d1ec238d9f66fa62779785 diff --git a/devel/py-gobject/patches/patch-aa b/devel/py-gobject/patches/patch-aa index b5cef08c404..d672f2b3bce 100644 --- a/devel/py-gobject/patches/patch-aa +++ b/devel/py-gobject/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2009/01/07 21:28:57 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2009/06/09 13:25:02 wiz Exp $ ---- Makefile.in.orig 2009-01-04 21:34:58.000000000 +0100 +--- Makefile.in.orig 2009-05-24 20:37:47.000000000 +0000 +++ Makefile.in -@@ -816,7 +816,7 @@ info: info-recursive +@@ -820,7 +820,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-pkgconfigDATA +install-data-am: install-data-local - install-exec-am: install-exec-local install-pkgpyexecLTLIBRARIES \ - install-pkgpyexecPYTHON install-pyexecLTLIBRARIES \ + install-dvi: install-dvi-recursive + diff --git a/devel/py-gobject/patches/patch-ab b/devel/py-gobject/patches/patch-ab index 01522fe2727..1c5b9ed15f9 100644 --- a/devel/py-gobject/patches/patch-ab +++ b/devel/py-gobject/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2009/01/07 21:28:57 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2009/06/09 13:25:02 wiz Exp $ ---- gobject/Makefile.in.orig 2009-01-04 21:34:58.000000000 +0100 +--- gobject/Makefile.in.orig 2009-05-24 20:37:47.000000000 +0000 +++ gobject/Makefile.in -@@ -693,7 +693,7 @@ info: info-am +@@ -689,7 +689,7 @@ info: info-am info-am: install-data-am: install-nodist_pygobjectPYTHON \ @@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.5 2009/01/07 21:28:57 wiz Exp $ + install-pygobjectLTLIBRARIES \ install-pygobjectPYTHON - install-exec-am: + install-dvi: install-dvi-am diff --git a/devel/py-gobject/patches/patch-ad b/devel/py-gobject/patches/patch-ad deleted file mode 100644 index 7b4a3661b38..00000000000 --- a/devel/py-gobject/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/01/20 17:13:30 sketch Exp $ - ---- gobject/pygobject.c.orig Tue Jan 20 17:08:43 2009 -+++ gobject/pygobject.c Tue Jan 20 17:10:08 2009 -@@ -419,7 +419,7 @@ - 0 - }; - --struct empty {} _empty; -+struct empty {char notreally;} _empty; - PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, _empty); - - static PyObject * |