pool/python-gobject
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 79291 from devel:languages:python

Browse Source 
Update to 2.90.2 - Please forward this and also python-gobject2 to Factory (forwarded request 79274 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/79291
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-gobject?expand=0&rev=10
This commit is contained in:
Marcus Rückert 2011-08-19 13:21:58 +00:00 committed by Git OBS Bridge
parent a4e83d49bb
commit d96c64c989
7 changed files with 133 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pygobject-2.28.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee
size 888240

3
pygobject-2.90.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45bd788ecd819305ef6a1fc1e2771cd78a4532d7a29a3bb358a612b058b1d96e
size 687809

91
python-gobject-python3.patch
View File

@ -1,91 +0,0 @@
From 4e5833d0c2fe548617e5ea510f05920fd0caf73b Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <icq@gnome.org>
Date: Thu, 21 Apr 2011 14:52:20 +0000
Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore
---
(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 <johnp@redhat.com>
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
dnl versions of packages we require ...
m4_define(introspection_required_version, 0.10.2)
-m4_define(pycairo_required_version, 1.2.0)
+m4_define(py2cairo_required_version, 1.2.0)
+m4_define(py3cairo_required_version, 1.10.0)
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
AC_SUBST(GI_DATADIR)
if test "$enable_cairo" != no; then
- PKG_CHECK_MODULES(PYCAIRO,
- pycairo >= pycairo_required_version
- )
+ if test $build_py3k = true; then
+ PKG_CHECK_MODULES(PYCAIRO,
+ py3cairo >= py3cairo_required_version
+ )
+ else
+ PKG_CHECK_MODULES(PYCAIRO,
+ pycairo >= py2cairo_required_version
+ )
+ fi
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);
#endif
if (Pycairo_CAPI == NULL)
--
cgit v0.9

39
python-gobject.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Thu Aug 18 23:07:58 CEST 2011 - dimstar@opensuse.org
- Update to version 2.90.2:
+ remove tests that were removed from gi
+ don't calculate item_size using is_pointer
+ Updated signal example to use GObject introspection
+ Updated properties example to use GObject introspection
+ Add override for GLib.Variant.split_signature()
+ [pygi-convert.sh] Handle the import of pygtk and require
Gtk 3.0
+ Install pygobject.h again.
- Do not provide python-gobject2-devel anymore. It's a package of
its own.
-------------------------------------------------------------------
Mon Aug 15 09:01:29 UTC 2011 - dimstar@opensuse.org
- Update to 2.90.1 (3.0 pre-release):
+ New rewritten invoker is twice as fast and easier to extend and
debug
+ Complete break from static bindings so we may improve the core
without breaking legacy APIs
+ Better type handling
+ Parallel installable with PyGObject 2.28 for legacy binding
support (2.28 must be compiled with –disable-introspection)
+ Fixed object array handling
+ Added more overrides for PyGTK API emulation
+ Support for function calling using keyword arguments
+ GObject and GLib symbols can now have overrides
+ All static bit removed or made private
+ GVariants now work from callback returns
- Add xz BuildRequires to be able to decompress the tar.xz source.
- Drop python-gobject-python3.patch: fixed upstream.
- Split out shared library libpygobject-gi-2.0-python.
- No longer obsolete and provide: python-gobject2. We are no longer
compatible to what python-gobject2 used to provide. For
compatibility, a python-gobject2 package is being re-instated.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 17 11:53:53 CEST 2011 - vuntz@opensuse.org Fri Jun 17 11:53:53 CEST 2011 - vuntz@opensuse.org

60
python-gobject.spec
View File

@ -30,26 +30,24 @@
Name: python-gobject Name: python-gobject
%define _name pygobject %define _name pygobject
Summary: Python bindings for GObject Summary: Python bindings for GObject
Version: 2.28.6 Version: 2.90.2
Release: 2 Release: 1
License: LGPLv2.1+ License: LGPLv2.1+
Group: Development/Libraries/Python Group: Development/Libraries/Python
Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/
Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/%{_name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/pygobject/2.90/%{_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM python-gobject-python3.patch vuntz@opensuse.org -- Taken from git, various fixes for python3
Patch0: python-gobject-python3.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel >= 0.10.2
BuildRequires: libffi-devel BuildRequires: libffi-devel
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
%if %{build_for_python3} %if %{build_for_python3}
BuildRequires: python3-cairo-devel BuildRequires: python3-cairo-devel
BuildRequires: python3-devel BuildRequires: python3-devel
%else %else
BuildRequires: python-cairo-devel BuildRequires: python-cairo-devel
BuildRequires: python-devel BuildRequires: python-devel
Provides: python-gobject2 = %{version}
Obsoletes: python-gobject2 < %{version}
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{local_py_requires} %{local_py_requires}
@ -63,10 +61,6 @@ License: LGPLv2.1+
Summary: Python bindings for GObject -- Cairo bindings Summary: Python bindings for GObject -- Cairo bindings
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
%if ! %{build_for_python3}
Provides: python-gobject2-cairo = %{version}
Obsoletes: python-gobject2-cairo < %{version}
%endif
%define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo) %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
Supplements: packageand(%{name}:%{cairo_real_package}) Supplements: packageand(%{name}:%{cairo_real_package})
@ -76,19 +70,25 @@ GLib's GObjects.
This package contains the Python Cairo bindings for GObject. This package contains the Python Cairo bindings for GObject.
%package -n libpyglib-gi-2_0-python0
Summary: Python Gobject Introspeciton binding
Group: System/Libraries
%description -n libpyglib-gi-2_0-python0
Pygobjects is an extension module for python that gives you access to
GLib's GObjects.
The bindings are handled by gobject-introspection libraries.
%package devel %package devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Python bindings for GObject Summary: Python bindings for GObject
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: libpyglib-gi-2_0-python0 = %{version}
%if %{build_for_python3} %if %{build_for_python3}
# Several files are conflicting between python2 and python3 builds # Several files are conflicting between python2 and python3 builds
Conflicts: python-gobject-devel Conflicts: python-gobject-devel
%else
Provides: python-gobject2-devel = %{version}
Obsoletes: python-gobject2-devel < %{version}
Provides: python-gobject2-doc = %{version}
Obsoletes: python-gobject2-doc < %{version}
%endif %endif
%description devel %description devel
@ -97,8 +97,6 @@ addon libraries such as pygtk.
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch0 -p1
autoreconf -fi
%build %build
%if %{build_for_python3} %if %{build_for_python3}
@ -116,47 +114,41 @@ rm examples/Makefile*
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -n libpyglib-gi-2_0-python0 -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -n libpyglib-gi-2_0-python0 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS NEWS README ChangeLog examples %doc AUTHORS NEWS README ChangeLog examples
%dir %{local_py_sitedir}/gtk-2.0 %dir %{local_py_sitedir}/gtk-2.0
%{local_py_sitedir}/gi/ %{local_py_sitedir}/gi/
%{local_py_sitedir}/gtk-2.0/gio/
%{local_py_sitedir}/glib/
%{local_py_sitedir}/gobject/
%{local_py_sitedir}/gtk-2.0/dsextras.py* %{local_py_sitedir}/gtk-2.0/dsextras.py*
%{local_py_sitedir}/pygtk.*
%{_libdir}/*.so.*
# Live in cairo subpackage # Live in cairo subpackage
%exclude %{local_py_sitedir}/gi/_gi_cairo.so %exclude %{local_py_sitedir}/gi/_gi_cairo.so
%files -n libpyglib-gi-2_0-python0
%defattr(-, root, root)
%{_libdir}/libpyglib-gi-2.0-python.so.0*
%files cairo %files cairo
%defattr(-,root,root) %defattr(-,root,root)
%{local_py_sitedir}/gi/_gi_cairo.so %{local_py_sitedir}/gi/_gi_cairo.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/pygtk-2.0/ %{_includedir}/pygobject-3.0/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/pygobject-2.0.pc %{_libdir}/pkgconfig/pygobject-3.0.pc
## codegen
%{_bindir}/pygobject-codegen-2.0
# we explicitly list the directories here to be sure we don't include something # we explicitly list the directories here to be sure we don't include something
# that should live in the main package # that should live in the main package
%dir %{_datadir}/%{_name} %dir %{_datadir}/%{_name}
%dir %{_datadir}/%{_name}/2.0
%{_datadir}/%{_name}/2.0/codegen/
%{_datadir}/%{_name}/2.0/defs/
%{_datadir}/%{_name}/xsl/ %{_datadir}/%{_name}/xsl/
## doc: we need the files there since building API docs for other python ## doc: we need the files there since building API docs for other python
## bindings require some files from here ## bindings require some files from here
# Own these repositories to not depend on gtk-doc while building: # Own these repositories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/pygobject/ %doc %{_datadir}/gtk-doc/html/pygobject/
%changelog %changelog

39
python3-gobject.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Thu Aug 18 23:07:58 CEST 2011 - dimstar@opensuse.org
- Update to version 2.90.2:
+ remove tests that were removed from gi
+ don't calculate item_size using is_pointer
+ Updated signal example to use GObject introspection
+ Updated properties example to use GObject introspection
+ Add override for GLib.Variant.split_signature()
+ [pygi-convert.sh] Handle the import of pygtk and require
Gtk 3.0
+ Install pygobject.h again.
- Do not provide python-gobject2-devel anymore. It's a package of
its own.
-------------------------------------------------------------------
Mon Aug 15 09:01:29 UTC 2011 - dimstar@opensuse.org
- Update to 2.90.1 (3.0 pre-release):
+ New rewritten invoker is twice as fast and easier to extend and
debug
+ Complete break from static bindings so we may improve the core
without breaking legacy APIs
+ Better type handling
+ Parallel installable with PyGObject 2.28 for legacy binding
support (2.28 must be compiled with –disable-introspection)
+ Fixed object array handling
+ Added more overrides for PyGTK API emulation
+ Support for function calling using keyword arguments
+ GObject and GLib symbols can now have overrides
+ All static bit removed or made private
+ GVariants now work from callback returns
- Add xz BuildRequires to be able to decompress the tar.xz source.
- Drop python-gobject-python3.patch: fixed upstream.
- Split out shared library libpygobject-gi-2.0-python.
- No longer obsolete and provide: python-gobject2. We are no longer
compatible to what python-gobject2 used to provide. For
compatibility, a python-gobject2 package is being re-instated.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 17 11:53:53 CEST 2011 - vuntz@opensuse.org Fri Jun 17 11:53:53 CEST 2011 - vuntz@opensuse.org

60
python3-gobject.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package python3-gobject # spec file for package python-gobject
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -30,26 +30,24 @@
Name: python3-gobject Name: python3-gobject
%define _name pygobject %define _name pygobject
Summary: Python bindings for GObject Summary: Python bindings for GObject
Version: 2.28.6 Version: 2.90.2
Release: 1 Release: 1
License: LGPLv2.1+ License: LGPLv2.1+
Group: Development/Libraries/Python Group: Development/Libraries/Python
Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/ Url: http://ftp.gnome.org/pub/GNOME/sources/pygobject/
Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/%{_name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/pygobject/2.90/%{_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM python-gobject-python3.patch vuntz@opensuse.org -- Taken from git, various fixes for python3
Patch0: python-gobject-python3.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel >= 0.10.2
BuildRequires: libffi-devel BuildRequires: libffi-devel
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
%if %{build_for_python3} %if %{build_for_python3}
BuildRequires: python3-cairo-devel BuildRequires: python3-cairo-devel
BuildRequires: python3-devel BuildRequires: python3-devel
%else %else
BuildRequires: python-cairo-devel BuildRequires: python-cairo-devel
BuildRequires: python-devel BuildRequires: python-devel
Provides: python-gobject2 = %{version}
Obsoletes: python-gobject2 < %{version}
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{local_py_requires} %{local_py_requires}
@ -63,10 +61,6 @@ License: LGPLv2.1+
Summary: Python bindings for GObject -- Cairo bindings Summary: Python bindings for GObject -- Cairo bindings
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
%if ! %{build_for_python3}
Provides: python-gobject2-cairo = %{version}
Obsoletes: python-gobject2-cairo < %{version}
%endif
%define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo) %define cairo_real_package %(rpm -q --qf '%%{NAME}' --whatprovides cairo)
Supplements: packageand(%{name}:%{cairo_real_package}) Supplements: packageand(%{name}:%{cairo_real_package})
@ -76,19 +70,25 @@ GLib's GObjects.
This package contains the Python Cairo bindings for GObject. This package contains the Python Cairo bindings for GObject.
%package -n libpyglib-gi-2_0-python0
Summary: Python Gobject Introspeciton binding
Group: System/Libraries
%description -n libpyglib-gi-2_0-python0
Pygobjects is an extension module for python that gives you access to
GLib's GObjects.
The bindings are handled by gobject-introspection libraries.
%package devel %package devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Python bindings for GObject Summary: Python bindings for GObject
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: libpyglib-gi-2_0-python0 = %{version}
%if %{build_for_python3} %if %{build_for_python3}
# Several files are conflicting between python2 and python3 builds # Several files are conflicting between python2 and python3 builds
Conflicts: python-gobject-devel Conflicts: python-gobject-devel
%else
Provides: python-gobject2-devel = %{version}
Obsoletes: python-gobject2-devel < %{version}
Provides: python-gobject2-doc = %{version}
Obsoletes: python-gobject2-doc < %{version}
%endif %endif
%description devel %description devel
@ -97,8 +97,6 @@ addon libraries such as pygtk.
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch0 -p1
autoreconf -fi
%build %build
%if %{build_for_python3} %if %{build_for_python3}
@ -116,47 +114,41 @@ rm examples/Makefile*
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -n libpyglib-gi-2_0-python0 -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -n libpyglib-gi-2_0-python0 -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS NEWS README ChangeLog examples %doc AUTHORS NEWS README ChangeLog examples
%dir %{local_py_sitedir}/gtk-2.0 %dir %{local_py_sitedir}/gtk-2.0
%{local_py_sitedir}/gi/ %{local_py_sitedir}/gi/
%{local_py_sitedir}/gtk-2.0/gio/
%{local_py_sitedir}/glib/
%{local_py_sitedir}/gobject/
%{local_py_sitedir}/gtk-2.0/dsextras.py* %{local_py_sitedir}/gtk-2.0/dsextras.py*
%{local_py_sitedir}/pygtk.*
%{_libdir}/*.so.*
# Live in cairo subpackage # Live in cairo subpackage
%exclude %{local_py_sitedir}/gi/_gi_cairo.so %exclude %{local_py_sitedir}/gi/_gi_cairo.so
%files -n libpyglib-gi-2_0-python0
%defattr(-, root, root)
%{_libdir}/libpyglib-gi-2.0-python.so.0*
%files cairo %files cairo
%defattr(-,root,root) %defattr(-,root,root)
%{local_py_sitedir}/gi/_gi_cairo.so %{local_py_sitedir}/gi/_gi_cairo.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/pygtk-2.0/ %{_includedir}/pygobject-3.0/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/pygobject-2.0.pc %{_libdir}/pkgconfig/pygobject-3.0.pc
## codegen
%{_bindir}/pygobject-codegen-2.0
# we explicitly list the directories here to be sure we don't include something # we explicitly list the directories here to be sure we don't include something
# that should live in the main package # that should live in the main package
%dir %{_datadir}/%{_name} %dir %{_datadir}/%{_name}
%dir %{_datadir}/%{_name}/2.0
%{_datadir}/%{_name}/2.0/codegen/
%{_datadir}/%{_name}/2.0/defs/
%{_datadir}/%{_name}/xsl/ %{_datadir}/%{_name}/xsl/
## doc: we need the files there since building API docs for other python ## doc: we need the files there since building API docs for other python
## bindings require some files from here ## bindings require some files from here
# Own these repositories to not depend on gtk-doc while building: # Own these repositories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/pygobject/ %doc %{_datadir}/gtk-doc/html/pygobject/
%changelog %changelog