From e18a3dd9cfeb4eba91a64f04a32b081b389ea69372ba98ad3a9b94fea83537f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Apr 2014 20:49:09 +0000 Subject: [PATCH] Accepting request 228689 from GNOME:Next Push GNOME:Next - GNOME 3.12.0 OBS-URL: https://build.opensuse.org/request/show/228689 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=28 --- pycompile-searchpath.patch | 11 ++-- pygobject-3.10.2.tar.xz | 3 - pygobject-3.12.0.tar.xz | 3 + python-gobject.changes | 125 +++++++++++++++++++++++++++++++++++++ python-gobject.spec | 57 ++++++----------- python3-gobject.changes | 125 +++++++++++++++++++++++++++++++++++++ python3-gobject.spec | 57 ++++++----------- 7 files changed, 299 insertions(+), 82 deletions(-) delete mode 100644 pygobject-3.10.2.tar.xz create mode 100644 pygobject-3.12.0.tar.xz diff --git a/pycompile-searchpath.patch b/pycompile-searchpath.patch index abe581e..7044fd9 100644 --- a/pycompile-searchpath.patch +++ b/pycompile-searchpath.patch @@ -1,8 +1,8 @@ -Index: pygobject-3.10.2/py-compile +Index: pygobject-3.11.92/py-compile =================================================================== ---- pygobject-3.10.2/py-compile 2013-11-11 14:36:41.000000000 +0100 -+++ pygobject-3.10.2/py-compile 2014-02-13 15:52:46.990468006 +0100 -@@ -116,7 +116,11 @@ +--- pygobject-3.11.92.orig/py-compile ++++ pygobject-3.11.92/py-compile +@@ -116,7 +116,11 @@ else fi $PYTHON -c " @@ -15,7 +15,7 @@ Index: pygobject-3.10.2/py-compile files = '''$files''' -@@ -137,7 +141,10 @@ +@@ -137,7 +141,11 @@ sys.stdout.write('\n')" || exit $? # this will fail for python < 1.5, but that doesn't matter ... $PYTHON -O -c " @@ -23,6 +23,7 @@ Index: pygobject-3.10.2/py-compile +import sys +# when this runs interactively, '' (cwd) is in sys.path. we don't want that. +sys.path.remove('') ++ +import os, py_compile, imp # pypy does not use .pyo optimization diff --git a/pygobject-3.10.2.tar.xz b/pygobject-3.10.2.tar.xz deleted file mode 100644 index 3619c76..0000000 --- a/pygobject-3.10.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326 -size 672092 diff --git a/pygobject-3.12.0.tar.xz b/pygobject-3.12.0.tar.xz new file mode 100644 index 0000000..cb61b1d --- /dev/null +++ b/pygobject-3.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d4485311fcfb073dc37432e36ad1d45bcf9f8796a1e8ff20a6494e0297dbd1a +size 701792 diff --git a/python-gobject.changes b/python-gobject.changes index 23f6679..caed888 100644 --- a/python-gobject.changes +++ b/python-gobject.changes @@ -1,3 +1,128 @@ +------------------------------------------------------------------- +Mon Mar 24 12:09:56 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.12.0: + + No changes since version 3.11.92. + +------------------------------------------------------------------- +Tue Mar 18 10:36:39 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.92: + + Build system: Remove option to build without libffi. + + Docs: Standardize Python doc strings. + + Fix reference leaks with (transfer full) foreign struct returns + (bgo#726206). +- Rebase pycompile-searchpath.patch. + +------------------------------------------------------------------- +Tue Mar 4 19:35:36 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.91: + + Use ffi_call directly instead of g_callable_info_invoke + (bgo##723642). + + configure.ac: Use -std=c90 and error on + declaration-after-statement. + + Fix Build on Visual Studio (bgo##725122). + +------------------------------------------------------------------- +Thu Feb 20 03:11:57 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.11.90: + + Use GObject type checking for instance arguments (bgo#724009). + +------------------------------------------------------------------- +Thu Feb 20 03:11:05 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.5: + + Cache refactoring: Move all cache marshalers into files based + on type (bgo#709700). + + Merge static PyGLib and PyGObject modules into PyGI + (bgo#712197). + + Add test for callback user data arguments with following + arguments (bgo#722104). + + build: + - Add --without-common configure option for package maintainers + (bgo#721646). + - Set PLATFORM_VERSION again to 3.0. + + demo: Add TreeModel interface implementation demonstration. + + tests: + - Run PyFlakes and PEP8 only on SUBDIRS. + - Add test for an owned boxed struct passed in a callback + (bgo#722899). +- Pass without-common to configure when building for pythonn: this + replaces the old method of deleting files during the install + phase. +- Drop libpyglib-gi-2_0-python%{local_lib_ver} subpackage: the + static PyGlib has been merged into PyGI. +- No longer provide a -devel package when building for python3: the + resulting package after cleanup would be empty. +- Obsolete/provide python3-gobject-devel by python-gobject-devel to + ease upgrades. +- Require python3-gobject from python-gobject-devel (this was + brought in before by requiring python3-gobject-devel, which in + turn pulled in python3-gobject. With the removal of the python3 + based -devel package (see above), we need to require the python3 + variant by ourself. +- Rebase pycompile-searchpath.patch. + +------------------------------------------------------------------- +Thu Feb 20 03:11:04 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.4: + + overrides: Fix __repr__ for various Gdk structs. + + Add enum and flags member methods (bgo#693099). + + python.m4: g/c JD_PYTHON_CHECK_VERSION (bgo#721662). + + Support union creation with PyGIStruct.a + + docs: Fix array length argument skipping with preceding out + arguments. + + Updated docs (bgo#708060, bgo#697356, bgo#697356). + + gtk-demo: Add CSS demos (bgo#719722). + + build: Avoid clash between gi/types.py and stdlib (bgo#721025). + +------------------------------------------------------------------- +Thu Feb 20 03:11:03 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.3: + + Replace usage of PyGIBoxed_Type with PyGIStruct_Type + (bgo#581525). + +------------------------------------------------------------------- +Thu Feb 20 03:11:02 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.2: + + gkt-demo: Change main info/source notebook into a GtkStack. + + Add deprecation warnings and cleanup class initializer + overrides (bgo#705810). + + Fix dir method for static GParamSpec in Python 3. + + Remove overzealous argument checking for callback userdata + (bgo#711173). + +------------------------------------------------------------------- +Thu Feb 20 00:00:00 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.1: + + Fix toggleref safety problems by always enabling the GIL + (bgo#709223). + + Add consistent GLib.MainLoop SIGINT cleanup (bgo#710978). + + docs: Add a keyword value of None for allow-none annotations + (bgo#640812). + + Remove overrides for supporting pre-3.10 GObject signal + functions. + + Add threads_init back as a requirement for non-Python threaded + repos (bgo#710447). + + Add dir method to GObject props accessor (bgo#705754). + + Remove PyGObjectWeakRef now that g_binding_unbind exists + (bgo#699571). + + Fix lots of memory leaks leaks (bgo#693402). + + Add support for variable user data arguments (bgo#640812). + + Bump glib and g-i dependencies to latest stable. + + Expose all GI enum and flags types (bgo#709008). + + Add support for default arguments annotated with allow-none + (bgo#640812). + + Refactor argument cache handling (bgo#640812). + + Remove support for allowing PyObjects as void pointers + (bgo#688081). + ------------------------------------------------------------------- Thu Feb 13 14:57:57 UTC 2014 - jmatejek@suse.com diff --git a/python-gobject.spec b/python-gobject.spec index 261d4ea..1375cab 100644 --- a/python-gobject.spec +++ b/python-gobject.spec @@ -37,16 +37,16 @@ Name: python-gobject Summary: Python bindings for GObject License: LGPL-2.1+ Group: Development/Libraries/Python -Version: 3.10.2 +Version: 3.12.0 Release: 0 Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ -Source: http://download.gnome.org/sources/pygobject/3.10/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pygobject/3.12/%{_name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM pycompile-searchpath.patch jmatejek@suse.com -- Fix build with python 3.4 Patch1: pycompile-searchpath.patch BuildRequires: fdupes -BuildRequires: glib2-devel >= 2.35.9 -BuildRequires: gobject-introspection-devel >= 1.35.9 -BuildRequires: libffi-devel +BuildRequires: glib2-devel >= 2.38.0 +BuildRequires: gobject-introspection-devel >= 1.38.0 +BuildRequires: libffi-devel >= 3.0.0 %if %{build_for_python3} BuildRequires: python3-cairo-devel BuildRequires: python3-devel @@ -78,29 +78,23 @@ GLib's GObjects. This package contains the Python Cairo bindings for GObject. -%package -n libpyglib-gi-2_0-python%{local_lib_ver} -Summary: Python Gobject Introspeciton binding -Group: System/Libraries - -%description -n libpyglib-gi-2_0-python%{local_lib_ver} -Pygobjects is an extension module for python that gives you access to -GLib's GObjects. - -The bindings are handled by gobject-introspection libraries. - +%if ! %{build_for_python3} %package devel Summary: Python bindings for GObject Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: libpyglib-gi-2_0-python%{local_lib_ver} = %{version} -%if ! %{build_for_python3} -# If somebody wants the -devel package, we provide the full set. -Requires: python3-gobject-devel -%endif +Requires: python3-gobject = %{version} +# Until version 3.11.5, the -devel package contained python2 / python3 specifiecs +# AS this was cleared and the package no longer depends on the python version, the +# python3-gobject-devel package is no longer being built. In order to ease upgrades +# and remove the obsolete package, we obsolete/provide it here. +Obsoletes: python3-gobject-devel < 3.11.5 +Provides: python3-gobject-devel = %{version} %description devel This package contains files required to build wrappers for gobject addon libraries such as pygtk. +%endif %prep %setup -q -n %{_name}-%{version} @@ -110,18 +104,16 @@ addon libraries such as pygtk. %if %{build_for_python3} export PYTHON=python3 %endif -%configure +%configure \ +%if %{build_for_python3} + --without-common +%endif + make %{?jobs:-j%jobs} V=1 %install %makeinstall find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f -%if %{build_for_python3} -# If we're building for python3, we remove the header and .pc file... -# Those files are python-version agnostic... so it does not matter. -rm -r %{buildroot}%{_includedir}/pygobject-3.0/pygobject.h -rm %{buildroot}%{_libdir}/pkgconfig/pygobject-3.0.pc -%endif # Drop pygtkcompat layer.it's useless and we lack other stuff for it to work rm %{buildroot}%{local_py_sitedir}/gi/pygtkcompat.py rm -r %{buildroot}%{local_py_sitedir}/pygtkcompat/ @@ -131,10 +123,6 @@ rm examples/Makefile* %clean rm -rf $RPM_BUILD_ROOT -%post -n libpyglib-gi-2_0-python%{local_lib_ver} -p /sbin/ldconfig - -%postun -n libpyglib-gi-2_0-python%{local_lib_ver} -p /sbin/ldconfig - %files %defattr(-,root,root) %doc AUTHORS NEWS README ChangeLog examples @@ -143,18 +131,13 @@ rm -rf $RPM_BUILD_ROOT # Lives in cairo subpackage %exclude %{local_py_sitedir}/gi/_gi_cairo*.so -%files -n libpyglib-gi-2_0-python%{local_lib_ver} -%defattr(-, root, root) -%{_libdir}/libpyglib-gi-2.0-python%{local_py_suffix}.so.0* - %files cairo %defattr(-,root,root) %{local_py_sitedir}/gi/_gi_cairo*.so +%if ! %{build_for_python3} %files devel %defattr(-,root,root) -%{_libdir}/*.so -%if ! %{build_for_python3} %{_includedir}/pygobject-3.0/ %{_libdir}/pkgconfig/pygobject-3.0.pc %endif diff --git a/python3-gobject.changes b/python3-gobject.changes index 23f6679..caed888 100644 --- a/python3-gobject.changes +++ b/python3-gobject.changes @@ -1,3 +1,128 @@ +------------------------------------------------------------------- +Mon Mar 24 12:09:56 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.12.0: + + No changes since version 3.11.92. + +------------------------------------------------------------------- +Tue Mar 18 10:36:39 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.92: + + Build system: Remove option to build without libffi. + + Docs: Standardize Python doc strings. + + Fix reference leaks with (transfer full) foreign struct returns + (bgo#726206). +- Rebase pycompile-searchpath.patch. + +------------------------------------------------------------------- +Tue Mar 4 19:35:36 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.91: + + Use ffi_call directly instead of g_callable_info_invoke + (bgo##723642). + + configure.ac: Use -std=c90 and error on + declaration-after-statement. + + Fix Build on Visual Studio (bgo##725122). + +------------------------------------------------------------------- +Thu Feb 20 03:11:57 UTC 2014 - zaitor@opensuse.org + +- Update to version 3.11.90: + + Use GObject type checking for instance arguments (bgo#724009). + +------------------------------------------------------------------- +Thu Feb 20 03:11:05 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.5: + + Cache refactoring: Move all cache marshalers into files based + on type (bgo#709700). + + Merge static PyGLib and PyGObject modules into PyGI + (bgo#712197). + + Add test for callback user data arguments with following + arguments (bgo#722104). + + build: + - Add --without-common configure option for package maintainers + (bgo#721646). + - Set PLATFORM_VERSION again to 3.0. + + demo: Add TreeModel interface implementation demonstration. + + tests: + - Run PyFlakes and PEP8 only on SUBDIRS. + - Add test for an owned boxed struct passed in a callback + (bgo#722899). +- Pass without-common to configure when building for pythonn: this + replaces the old method of deleting files during the install + phase. +- Drop libpyglib-gi-2_0-python%{local_lib_ver} subpackage: the + static PyGlib has been merged into PyGI. +- No longer provide a -devel package when building for python3: the + resulting package after cleanup would be empty. +- Obsolete/provide python3-gobject-devel by python-gobject-devel to + ease upgrades. +- Require python3-gobject from python-gobject-devel (this was + brought in before by requiring python3-gobject-devel, which in + turn pulled in python3-gobject. With the removal of the python3 + based -devel package (see above), we need to require the python3 + variant by ourself. +- Rebase pycompile-searchpath.patch. + +------------------------------------------------------------------- +Thu Feb 20 03:11:04 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.4: + + overrides: Fix __repr__ for various Gdk structs. + + Add enum and flags member methods (bgo#693099). + + python.m4: g/c JD_PYTHON_CHECK_VERSION (bgo#721662). + + Support union creation with PyGIStruct.a + + docs: Fix array length argument skipping with preceding out + arguments. + + Updated docs (bgo#708060, bgo#697356, bgo#697356). + + gtk-demo: Add CSS demos (bgo#719722). + + build: Avoid clash between gi/types.py and stdlib (bgo#721025). + +------------------------------------------------------------------- +Thu Feb 20 03:11:03 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.3: + + Replace usage of PyGIBoxed_Type with PyGIStruct_Type + (bgo#581525). + +------------------------------------------------------------------- +Thu Feb 20 03:11:02 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.2: + + gkt-demo: Change main info/source notebook into a GtkStack. + + Add deprecation warnings and cleanup class initializer + overrides (bgo#705810). + + Fix dir method for static GParamSpec in Python 3. + + Remove overzealous argument checking for callback userdata + (bgo#711173). + +------------------------------------------------------------------- +Thu Feb 20 00:00:00 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.11.1: + + Fix toggleref safety problems by always enabling the GIL + (bgo#709223). + + Add consistent GLib.MainLoop SIGINT cleanup (bgo#710978). + + docs: Add a keyword value of None for allow-none annotations + (bgo#640812). + + Remove overrides for supporting pre-3.10 GObject signal + functions. + + Add threads_init back as a requirement for non-Python threaded + repos (bgo#710447). + + Add dir method to GObject props accessor (bgo#705754). + + Remove PyGObjectWeakRef now that g_binding_unbind exists + (bgo#699571). + + Fix lots of memory leaks leaks (bgo#693402). + + Add support for variable user data arguments (bgo#640812). + + Bump glib and g-i dependencies to latest stable. + + Expose all GI enum and flags types (bgo#709008). + + Add support for default arguments annotated with allow-none + (bgo#640812). + + Refactor argument cache handling (bgo#640812). + + Remove support for allowing PyObjects as void pointers + (bgo#688081). + ------------------------------------------------------------------- Thu Feb 13 14:57:57 UTC 2014 - jmatejek@suse.com diff --git a/python3-gobject.spec b/python3-gobject.spec index 25dd860..0840395 100644 --- a/python3-gobject.spec +++ b/python3-gobject.spec @@ -37,16 +37,16 @@ Name: python3-gobject Summary: Python bindings for GObject License: LGPL-2.1+ Group: Development/Libraries/Python -Version: 3.10.2 +Version: 3.12.0 Release: 0 Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ -Source: http://download.gnome.org/sources/pygobject/3.10/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pygobject/3.12/%{_name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM pycompile-searchpath.patch jmatejek@suse.com -- Fix build with python 3.4 Patch1: pycompile-searchpath.patch BuildRequires: fdupes -BuildRequires: glib2-devel >= 2.35.9 -BuildRequires: gobject-introspection-devel >= 1.35.9 -BuildRequires: libffi-devel +BuildRequires: glib2-devel >= 2.38.0 +BuildRequires: gobject-introspection-devel >= 1.38.0 +BuildRequires: libffi-devel >= 3.0.0 %if %{build_for_python3} BuildRequires: python3-cairo-devel BuildRequires: python3-devel @@ -78,29 +78,23 @@ GLib's GObjects. This package contains the Python Cairo bindings for GObject. -%package -n libpyglib-gi-2_0-python%{local_lib_ver} -Summary: Python Gobject Introspeciton binding -Group: System/Libraries - -%description -n libpyglib-gi-2_0-python%{local_lib_ver} -Pygobjects is an extension module for python that gives you access to -GLib's GObjects. - -The bindings are handled by gobject-introspection libraries. - +%if ! %{build_for_python3} %package devel Summary: Python bindings for GObject Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: libpyglib-gi-2_0-python%{local_lib_ver} = %{version} -%if ! %{build_for_python3} -# If somebody wants the -devel package, we provide the full set. -Requires: python3-gobject-devel -%endif +Requires: python3-gobject = %{version} +# Until version 3.11.5, the -devel package contained python2 / python3 specifiecs +# AS this was cleared and the package no longer depends on the python version, the +# python3-gobject-devel package is no longer being built. In order to ease upgrades +# and remove the obsolete package, we obsolete/provide it here. +Obsoletes: python3-gobject-devel < 3.11.5 +Provides: python3-gobject-devel = %{version} %description devel This package contains files required to build wrappers for gobject addon libraries such as pygtk. +%endif %prep %setup -q -n %{_name}-%{version} @@ -110,18 +104,16 @@ addon libraries such as pygtk. %if %{build_for_python3} export PYTHON=python3 %endif -%configure +%configure \ +%if %{build_for_python3} + --without-common +%endif + make %{?jobs:-j%jobs} V=1 %install %makeinstall find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f -%if %{build_for_python3} -# If we're building for python3, we remove the header and .pc file... -# Those files are python-version agnostic... so it does not matter. -rm -r %{buildroot}%{_includedir}/pygobject-3.0/pygobject.h -rm %{buildroot}%{_libdir}/pkgconfig/pygobject-3.0.pc -%endif # Drop pygtkcompat layer.it's useless and we lack other stuff for it to work rm %{buildroot}%{local_py_sitedir}/gi/pygtkcompat.py rm -r %{buildroot}%{local_py_sitedir}/pygtkcompat/ @@ -131,10 +123,6 @@ rm examples/Makefile* %clean rm -rf $RPM_BUILD_ROOT -%post -n libpyglib-gi-2_0-python%{local_lib_ver} -p /sbin/ldconfig - -%postun -n libpyglib-gi-2_0-python%{local_lib_ver} -p /sbin/ldconfig - %files %defattr(-,root,root) %doc AUTHORS NEWS README ChangeLog examples @@ -143,18 +131,13 @@ rm -rf $RPM_BUILD_ROOT # Lives in cairo subpackage %exclude %{local_py_sitedir}/gi/_gi_cairo*.so -%files -n libpyglib-gi-2_0-python%{local_lib_ver} -%defattr(-, root, root) -%{_libdir}/libpyglib-gi-2.0-python%{local_py_suffix}.so.0* - %files cairo %defattr(-,root,root) %{local_py_sitedir}/gi/_gi_cairo*.so +%if ! %{build_for_python3} %files devel %defattr(-,root,root) -%{_libdir}/*.so -%if ! %{build_for_python3} %{_includedir}/pygobject-3.0/ %{_libdir}/pkgconfig/pygobject-3.0.pc %endif