diff options
| -rw-r--r-- | devel/py-gobject3-common/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-gobject3/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/py-gobject3/PLIST | 72 | ||||
| -rw-r--r-- | devel/py-gobject3/distinfo | 11 | ||||
| -rw-r--r-- | devel/py-gobject3/patches/patch-Makefile.in | 19 | ||||
| -rw-r--r-- | devel/py-gobject3/patches/patch-configure | 69 | ||||
| -rw-r--r-- | devel/py-gobject3/patches/patch-gi___gobject_Makefile.in | 34 |
7 files changed, 41 insertions, 172 deletions
diff --git a/devel/py-gobject3-common/Makefile b/devel/py-gobject3-common/Makefile index 36f70792937..49e2489e247 100644 --- a/devel/py-gobject3-common/Makefile +++ b/devel/py-gobject3-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/02/12 18:06:05 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2014/07/06 13:52:02 ryoon Exp $ PYTHON_FOR_BUILD_ONLY= yes @@ -15,7 +15,7 @@ do-build: INSTALLATION_DIRS+= include/pygobject-3.0 lib/pkgconfig do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/gi/_gobject/pygobject.h \ + ${INSTALL_SCRIPT} ${WRKSRC}/gi/pygobject.h \ ${DESTDIR}${PREFIX}/include/pygobject-3.0/pygobject.h ${INSTALL_SCRIPT} ${WRKSRC}/pygobject-3.0.pc \ ${DESTDIR}${PREFIX}/lib/pkgconfig/pygobject-3.0.pc diff --git a/devel/py-gobject3/Makefile.common b/devel/py-gobject3/Makefile.common index 74b4bb567ca..a56d2590bf8 100644 --- a/devel/py-gobject3/Makefile.common +++ b/devel/py-gobject3/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.2 2014/02/12 18:06:05 drochner Exp $ +# $NetBSD: Makefile.common,v 1.3 2014/07/06 13:52:02 ryoon Exp $ # used by devel/py-gobject3/Makefile # used by devel/py-gobject3-common/Makefile -VER= 3.10.2 +VER= 3.12.2 DISTNAME= pygobject-${VER} CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/} diff --git a/devel/py-gobject3/PLIST b/devel/py-gobject3/PLIST index 6a6adfb171f..3e11d263f1b 100644 --- a/devel/py-gobject3/PLIST +++ b/devel/py-gobject3/PLIST @@ -1,82 +1,76 @@ -@comment $NetBSD: PLIST,v 1.7 2014/02/12 00:57:25 prlw1 Exp $ -lib/libpyglib-gi-2.0-python${PYVERSSUFFIX}.la +@comment $NetBSD: PLIST,v 1.8 2014/07/06 13:52:02 ryoon Exp $ ${PYSITELIB}/gi/__init__.py ${PYSITELIB}/gi/__init__.pyc ${PYSITELIB}/gi/__init__.pyo +${PYSITELIB}/gi/_constants.pyc +${PYSITELIB}/gi/_constants.pyo +${PYSITELIB}/gi/_option.pyc +${PYSITELIB}/gi/_option.pyo +${PYSITELIB}/gi/_propertyhelper.pyc +${PYSITELIB}/gi/_propertyhelper.pyo +${PYSITELIB}/gi/_signalhelper.pyc +${PYSITELIB}/gi/_signalhelper.pyo +${PYSITELIB}/gi/docstring.pyc +${PYSITELIB}/gi/docstring.pyo +${PYSITELIB}/gi/importer.pyc +${PYSITELIB}/gi/importer.pyo +${PYSITELIB}/gi/module.pyc +${PYSITELIB}/gi/module.pyo +${PYSITELIB}/gi/pygtkcompat.pyc +${PYSITELIB}/gi/pygtkcompat.pyo +${PYSITELIB}/gi/types.pyc +${PYSITELIB}/gi/types.pyo +${PYSITELIB}/gi/_constants.py ${PYSITELIB}/gi/_gi.la ${PYSITELIB}/gi/_gi_cairo.la -${PYSITELIB}/gi/_glib/__init__.py -${PYSITELIB}/gi/_glib/__init__.pyc -${PYSITELIB}/gi/_glib/__init__.pyo -${PYSITELIB}/gi/_glib/_glib.la -${PYSITELIB}/gi/_glib/option.py -${PYSITELIB}/gi/_glib/option.pyc -${PYSITELIB}/gi/_glib/option.pyo ${PYSITELIB}/gi/_gobject/__init__.py ${PYSITELIB}/gi/_gobject/__init__.pyc ${PYSITELIB}/gi/_gobject/__init__.pyo -${PYSITELIB}/gi/_gobject/_gobject.la -${PYSITELIB}/gi/_gobject/constants.py -${PYSITELIB}/gi/_gobject/constants.pyc -${PYSITELIB}/gi/_gobject/constants.pyo -${PYSITELIB}/gi/_gobject/propertyhelper.py -${PYSITELIB}/gi/_gobject/propertyhelper.pyc -${PYSITELIB}/gi/_gobject/propertyhelper.pyo -${PYSITELIB}/gi/_gobject/signalhelper.py -${PYSITELIB}/gi/_gobject/signalhelper.pyc -${PYSITELIB}/gi/_gobject/signalhelper.pyo +${PYSITELIB}/gi/_option.py +${PYSITELIB}/gi/_propertyhelper.py +${PYSITELIB}/gi/_signalhelper.py ${PYSITELIB}/gi/docstring.py -${PYSITELIB}/gi/docstring.pyc -${PYSITELIB}/gi/docstring.pyo ${PYSITELIB}/gi/importer.py -${PYSITELIB}/gi/importer.pyc -${PYSITELIB}/gi/importer.pyo ${PYSITELIB}/gi/module.py -${PYSITELIB}/gi/module.pyc -${PYSITELIB}/gi/module.pyo ${PYSITELIB}/gi/overrides/GIMarshallingTests.py +${PYSITELIB}/gi/overrides/GLib.py +${PYSITELIB}/gi/overrides/GObject.py +${PYSITELIB}/gi/overrides/Gdk.py +${PYSITELIB}/gi/overrides/Gio.py +${PYSITELIB}/gi/overrides/Gtk.py +${PYSITELIB}/gi/overrides/Pango.py +${PYSITELIB}/gi/overrides/__init__.py ${PYSITELIB}/gi/overrides/GIMarshallingTests.pyc ${PYSITELIB}/gi/overrides/GIMarshallingTests.pyo -${PYSITELIB}/gi/overrides/GLib.py ${PYSITELIB}/gi/overrides/GLib.pyc ${PYSITELIB}/gi/overrides/GLib.pyo -${PYSITELIB}/gi/overrides/GObject.py ${PYSITELIB}/gi/overrides/GObject.pyc ${PYSITELIB}/gi/overrides/GObject.pyo -${PYSITELIB}/gi/overrides/Gdk.py ${PYSITELIB}/gi/overrides/Gdk.pyc ${PYSITELIB}/gi/overrides/Gdk.pyo -${PYSITELIB}/gi/overrides/Gio.py ${PYSITELIB}/gi/overrides/Gio.pyc ${PYSITELIB}/gi/overrides/Gio.pyo -${PYSITELIB}/gi/overrides/Gtk.py ${PYSITELIB}/gi/overrides/Gtk.pyc ${PYSITELIB}/gi/overrides/Gtk.pyo -${PYSITELIB}/gi/overrides/Pango.py ${PYSITELIB}/gi/overrides/Pango.pyc ${PYSITELIB}/gi/overrides/Pango.pyo -${PYSITELIB}/gi/overrides/__init__.py ${PYSITELIB}/gi/overrides/__init__.pyc ${PYSITELIB}/gi/overrides/__init__.pyo -${PYSITELIB}/gi/overrides/keysyms.py ${PYSITELIB}/gi/overrides/keysyms.pyc ${PYSITELIB}/gi/overrides/keysyms.pyo +${PYSITELIB}/gi/overrides/keysyms.py ${PYSITELIB}/gi/pygtkcompat.py -${PYSITELIB}/gi/pygtkcompat.pyc -${PYSITELIB}/gi/pygtkcompat.pyo ${PYSITELIB}/gi/repository/__init__.py ${PYSITELIB}/gi/repository/__init__.pyc ${PYSITELIB}/gi/repository/__init__.pyo ${PYSITELIB}/gi/types.py -${PYSITELIB}/gi/types.pyc -${PYSITELIB}/gi/types.pyo ${PYSITELIB}/pygobject-${PKGVERSION}-py${PYVERSSUFFIX}-${PLATFORM}.egg-info ${PYSITELIB}/pygtkcompat/__init__.py ${PYSITELIB}/pygtkcompat/__init__.pyc ${PYSITELIB}/pygtkcompat/__init__.pyo -${PYSITELIB}/pygtkcompat/generictreemodel.py ${PYSITELIB}/pygtkcompat/generictreemodel.pyc ${PYSITELIB}/pygtkcompat/generictreemodel.pyo -${PYSITELIB}/pygtkcompat/pygtkcompat.py ${PYSITELIB}/pygtkcompat/pygtkcompat.pyc ${PYSITELIB}/pygtkcompat/pygtkcompat.pyo +${PYSITELIB}/pygtkcompat/generictreemodel.py +${PYSITELIB}/pygtkcompat/pygtkcompat.py diff --git a/devel/py-gobject3/distinfo b/devel/py-gobject3/distinfo index ff061dfc4f7..93e55b07040 100644 --- a/devel/py-gobject3/distinfo +++ b/devel/py-gobject3/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.9 2014/02/12 00:57:25 prlw1 Exp $ +$NetBSD: distinfo,v 1.10 2014/07/06 13:52:02 ryoon Exp $ -SHA1 (pygobject-3.10.2.tar.xz) = 693cc1cb692a8f21ff27d28eaa780f5e67cafb1a -RMD160 (pygobject-3.10.2.tar.xz) = 96b8ecc9862750135ad4ea1278a5b1ce78e73c76 -Size (pygobject-3.10.2.tar.xz) = 672092 bytes -SHA1 (patch-Makefile.in) = 7c365f074b6f4a079cb7ca032c6c7db26116d538 -SHA1 (patch-configure) = f8f237b9c6ce942eb1c169a40489098b4bb6ecdf -SHA1 (patch-gi___gobject_Makefile.in) = fb7dca31865e970044dfb15db99f83e7a2ddb7b6 +SHA1 (pygobject-3.12.2.tar.xz) = baa04755667fc5159ec99b7f250757bd0bce949c +RMD160 (pygobject-3.12.2.tar.xz) = 3665ba7b99d1c5af312f95dd285c11c0e5f2149a +Size (pygobject-3.12.2.tar.xz) = 702176 bytes diff --git a/devel/py-gobject3/patches/patch-Makefile.in b/devel/py-gobject3/patches/patch-Makefile.in deleted file mode 100644 index 791c89f40b8..00000000000 --- a/devel/py-gobject3/patches/patch-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2014/02/12 00:57:25 prlw1 Exp $ - -build: Add --without-common configure option for package maintainers -https://bugzilla.gnome.org/show_bug.cgi?id=721646 -commit 15fdd827ce4bff847fb35c817c6ea2d3650eec00 - ---- Makefile.in.orig 2013-12-12 00:22:35.000000000 +0000 -+++ Makefile.in -@@ -445,8 +445,8 @@ BUILT_EXTRA_DIST = \ - - - # pkg-config files --pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc -+@WITH_COMMON_TRUE@pkgconfigdir = $(libdir)/pkgconfig -+@WITH_COMMON_TRUE@pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc - - # python - pyexec_LTLIBRARIES = diff --git a/devel/py-gobject3/patches/patch-configure b/devel/py-gobject3/patches/patch-configure deleted file mode 100644 index 3c57235e73a..00000000000 --- a/devel/py-gobject3/patches/patch-configure +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2014/02/12 00:57:25 prlw1 Exp $ - -build: Add --without-common configure option for package maintainers -https://bugzilla.gnome.org/show_bug.cgi?id=721646 -commit 15fdd827ce4bff847fb35c817c6ea2d3650eec00 - ---- configure.orig 2013-12-12 00:22:35.000000000 +0000 -+++ configure -@@ -648,6 +648,8 @@ CODE_COVERAGE_ENABLED_TRUE - WARN_CFLAGS - INTROSPECTION_COMPILER - INTROSPECTION_SCANNER -+WITH_COMMON_FALSE -+WITH_COMMON_TRUE - ENABLE_CAIRO_FALSE - ENABLE_CAIRO_TRUE - PYCAIRO_LIBS -@@ -828,6 +830,7 @@ enable_thread - enable_glibtest - with_ffi - enable_cairo -+with_common - enable_compile_warnings - enable_iso_c - enable_code_coverage -@@ -1505,6 +1508,8 @@ Optional Packages: - program name is given; if not given, searches for a - few standard names such as "python3" or "python2" - --without-ffi Disable libffi support -+ --without-common For package maintainers: do not install Python -+ version independent files - - Some influential environment variables: - CC C compiler command -@@ -14294,6 +14299,23 @@ else - fi - - -+ -+# Check whether --with-common was given. -+if test "${with_common+set}" = set; then : -+ withval=$with_common; with_common=$enableval -+else -+ with_common=yes -+fi -+ -+ if test "$with_common" = "yes"; then -+ WITH_COMMON_TRUE= -+ WITH_COMMON_FALSE='#' -+else -+ WITH_COMMON_TRUE='#' -+ WITH_COMMON_FALSE= -+fi -+ -+ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - -@@ -14967,6 +14989,10 @@ if test -z "${ENABLE_CAIRO_TRUE}" && tes - as_fn_error $? "conditional \"ENABLE_CAIRO\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${WITH_COMMON_TRUE}" && test -z "${WITH_COMMON_FALSE}"; then -+ as_fn_error $? "conditional \"WITH_COMMON\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then - as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/devel/py-gobject3/patches/patch-gi___gobject_Makefile.in b/devel/py-gobject3/patches/patch-gi___gobject_Makefile.in deleted file mode 100644 index a47009f7774..00000000000 --- a/devel/py-gobject3/patches/patch-gi___gobject_Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-gi___gobject_Makefile.in,v 1.1 2014/02/12 00:57:25 prlw1 Exp $ - -build: Add --without-common configure option for package maintainers -https://bugzilla.gnome.org/show_bug.cgi?id=721646 -commit 15fdd827ce4bff847fb35c817c6ea2d3650eec00 - ---- gi/_gobject/Makefile.in.orig 2013-12-12 00:22:35.000000000 +0000 -+++ gi/_gobject/Makefile.in -@@ -84,7 +84,7 @@ host_triplet = @host@ - subdir = gi/_gobject - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(pygobject_PYTHON) \ -- $(top_srcdir)/py-compile $(pkginclude_HEADERS) -+ $(top_srcdir)/py-compile $(am__pkginclude_HEADERS_DIST) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ - $(top_srcdir)/m4/jhflags.m4 $(top_srcdir)/m4/libtool.m4 \ -@@ -190,6 +190,7 @@ am__py_compile = PYTHON=$(PYTHON) $(SHEL - am__pep3147_tweak = \ - sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' - py_compile = $(top_srcdir)/py-compile -+am__pkginclude_HEADERS_DIST = pygobject.h - HEADERS = $(pkginclude_HEADERS) - am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) - # Read a list of newline-separated strings from the standard input, -@@ -379,7 +380,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.7 - PLATFORM_VERSION = 3.0 --pkginclude_HEADERS = pygobject.h -+@WITH_COMMON_TRUE@pkginclude_HEADERS = pygobject.h - extension_cppflags = \ - $(PYTHON_INCLUDES) \ - -DPY_SSIZE_T_CLEAN |