Hello community, here is the log from the commit of package python-gobject2 for openSUSE:Factory checked in at 2012-09-17 14:07:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gobject2 (Old) and /work/SRC/openSUSE:Factory/.python-gobject2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-gobject2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-gobject2/python-gobject2.changes 2011-12-02 09:28:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-gobject2.new/python-gobject2.changes 2012-09-17 14:07:58.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 13 02:15:50 UTC 2012 - [email protected] + +- Add python-gobject-gio_types.patch: patches taken from git, to fix + some type mismatches in gio-types.defs. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-gobject2/python3-gobject2.changes 2012-06-26 17:55:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-gobject2.new/python3-gobject2.changes 2012-09-17 14:07:58.000000000 +0200 @@ -2 +2 @@ -Thu Apr 26 15:08:01 UTC 2012 - [email protected] +Thu Sep 13 02:15:50 UTC 2012 - [email protected] @@ -4 +4,7 @@ -- Fix building of python 3 version on openSUSE 11.4 +- Add python-gobject-gio_types.patch: patches taken from git, to fix + some type mismatches in gio-types.defs. + +------------------------------------------------------------------- +Sun Nov 27 06:55:54 UTC 2011 - [email protected] + +- add libtool as buildrequire to avoid implicit dependency New: ---- python-gobject-gio_types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gobject2.spec ++++++ --- /var/tmp/diff_new_pack.e2NS84/_old 2012-09-17 14:07:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e2NS84/_new 2012-09-17 14:07:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-gobject2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_for_python3 0 @@ -30,18 +29,20 @@ Name: python-gobject2 %define _name pygobject Summary: Python bindings for GObject -Version: 2.28.6 -Release: 6 License: LGPL-2.1+ Group: Development/Libraries/Python +Version: 2.28.6 +Release: 0 Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/%{_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM python-gobject-python3.patch [email protected] -- Taken from git, various fixes for python3 Patch0: python-gobject-python3.patch +# PATCH-FIX-UPSTREAM python-gobject-gio_types.patch [email protected] -- fix some type mismatches in gio-types.defs, taken from git +Patch1: python-gobject-gio_types.patch BuildRequires: fdupes -BuildRequires: libtool BuildRequires: glib2-devel BuildRequires: libffi-devel +BuildRequires: libtool %if %{build_for_python3} BuildRequires: python3-cairo-devel BuildRequires: python3-devel @@ -57,7 +58,6 @@ GLib's GObjects. %package cairo -License: LGPL-2.1+ Summary: Python bindings for GObject -- Cairo bindings Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -71,7 +71,6 @@ This package contains the Python Cairo bindings for GObject. %package devel -License: LGPL-2.1+ Summary: Python bindings for GObject Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -90,6 +89,7 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 autoreconf -fi %build ++++++ python3-gobject2.spec ++++++ --- /var/tmp/diff_new_pack.e2NS84/_old 2012-09-17 14:07:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e2NS84/_new 2012-09-17 14:07:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-gobject2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_for_python3 1 %if %{build_for_python3} - -%if 0%{?suse_version} <= 1140 -%{!?python3_sitearch: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif %define local_py_requires Requires: python(abi) = %py3_ver %define local_py_sitedir %{python3_sitearch} %else @@ -34,18 +29,20 @@ Name: python3-gobject2 %define _name pygobject Summary: Python bindings for GObject -Version: 2.28.6 -Release: 6 License: LGPL-2.1+ Group: Development/Libraries/Python +Version: 2.28.6 +Release: 0 Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/%{_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM python-gobject-python3.patch [email protected] -- Taken from git, various fixes for python3 Patch0: python-gobject-python3.patch +# PATCH-FIX-UPSTREAM python-gobject-gio_types.patch [email protected] -- fix some type mismatches in gio-types.defs, taken from git +Patch1: python-gobject-gio_types.patch BuildRequires: fdupes -BuildRequires: libtool BuildRequires: glib2-devel BuildRequires: libffi-devel +BuildRequires: libtool %if %{build_for_python3} BuildRequires: python3-cairo-devel BuildRequires: python3-devel @@ -61,7 +58,6 @@ GLib's GObjects. %package cairo -License: LGPL-2.1+ Summary: Python bindings for GObject -- Cairo bindings Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -75,7 +71,6 @@ This package contains the Python Cairo bindings for GObject. %package devel -License: LGPL-2.1+ Summary: Python bindings for GObject Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -94,6 +89,7 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 autoreconf -fi %build ++++++ python-gobject-gio_types.patch ++++++ >From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 From: Ryan Lortie <[email protected]> Date: Mon, 12 Mar 2012 20:44:14 +0000 Subject: gio-types.defs: change some enums to flags These flags types were originally incorrectly handled in glib as being enums. That bug was fixed, but they're still enums here, leading to warnings about the mismatch. Change them to flags. https://bugzilla.gnome.org/show_bug.cgi?id=668522 --- diff --git a/gio/gio-types.defs b/gio/gio-types.defs index 331e0bc..7eee5c8 100644 --- a/gio/gio-types.defs +++ b/gio/gio-types.defs @@ -526,7 +526,7 @@ ) ) -(define-enum MountMountFlags +(define-flags MountMountFlags (in-module "gio") (c-name "GMountMountFlags") (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") @@ -545,7 +545,7 @@ ) ) -(define-enum DriveStartFlags +(define-flags DriveStartFlags (in-module "gio") (c-name "GDriveStartFlags") (gtype-id "G_TYPE_DRIVE_START_FLAGS") @@ -770,7 +770,7 @@ ) ) -(define-enum SocketMsgFlags +(define-flags SocketMsgFlags (in-module "gio") (c-name "GSocketMsgFlags") (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") -- cgit v0.9.0.2 ++++++ python-gobject-python3.patch ++++++ --- /var/tmp/diff_new_pack.e2NS84/_old 2012-09-17 14:07:59.000000000 +0200 +++ /var/tmp/diff_new_pack.e2NS84/_new 2012-09-17 14:07:59.000000000 +0200 @@ -6,46 +6,16 @@ --- (limited to 'gi/pygi-foreign-cairo.c') -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 10d5643..8353294 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -115,7 +115,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 -From 426c7109d4c0dbf0d56cc075f97f33b3451f79a8 Mon Sep 17 00:00:00 2001 -From: John (J5) Palmieri <[email protected]> -Date: Wed, 27 Apr 2011 19:47:19 +0000 -Subject: use PyCapsule when importing pycairo/require pycairo 1.10.0 for python3 builds - -* PyCObject is deprecated and pycairo 1.10.0 is first release to fix this issue --- -diff --git a/configure.ac b/configure.ac -index 0cc920b..fb69237 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,8 @@ m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pyg + configure.ac | 15 +++++++++++---- + gi/pygi-foreign-cairo.c | 7 ++++++- + 2 files changed, 17 insertions(+), 5 deletions(-) + +Index: pygobject-2.28.6/configure.ac +=================================================================== +--- pygobject-2.28.6.orig/configure.ac ++++ pygobject-2.28.6/configure.ac +@@ -17,7 +17,8 @@ m4_define(pygobject_version, pygobject_m dnl versions of packages we require ... m4_define(introspection_required_version, 0.10.2) @@ -55,7 +25,7 @@ m4_define(glib_required_version, 2.24.0) m4_define(gio_required_version, 2.24.0) m4_define(giounix_required_version, 2.22.4) -@@ -226,9 +227,15 @@ if test "$enable_introspection" != no; then +@@ -248,9 +249,15 @@ if test "$enable_introspection" != no; t AC_SUBST(GI_DATADIR) if test "$enable_cairo" != no; then @@ -74,18 +44,29 @@ fi fi AM_CONDITIONAL(ENABLE_INTROSPECTION, test "$enable_introspection" = "yes") -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 8353294..af84733 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -118,7 +118,7 @@ PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - #if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; - #else -- Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCapsule_Import("cairo.CAPI", 0); +Index: pygobject-2.28.6/gi/pygi-foreign-cairo.c +=================================================================== +--- pygobject-2.28.6.orig/gi/pygi-foreign-cairo.c ++++ pygobject-2.28.6/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include <pycairo/py3cairo.h> #endif +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_ + static PyMethodDef _gi_cairo_functions[] = {}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCapsule_Import("cairo.CAPI", 0); ++#endif ++ if (Pycairo_CAPI == NULL) --- -cgit v0.9 + return PYGLIB_MODULE_ERROR_RETURN; + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
