Author: qboosh Date: Sun May 22 19:03:55 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added pycairo patch (fixes build with python3-based pycairo 1.10.0)
---- Files affected:
packages/python-pygobject:
python-pygobject.spec (1.64 -> 1.65) , python-pygobject-pycairo.patch (NONE
-> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/python-pygobject/python-pygobject.spec
diff -u packages/python-pygobject/python-pygobject.spec:1.64
packages/python-pygobject/python-pygobject.spec:1.65
--- packages/python-pygobject/python-pygobject.spec:1.64 Mon Apr 18
22:40:21 2011
+++ packages/python-pygobject/python-pygobject.spec Sun May 22 21:03:49 2011
@@ -1,7 +1,8 @@
# $Revision$, $Date$
#
-%bcond_without python2
-%bcond_without python3
+# Conditional build:
+%bcond_without python2 # Python 2.x module
+%bcond_without python3 # Python 3.x module
#
%define module pygobject
#
@@ -17,6 +18,7 @@
Patch0: %{name}-pc.patch
Patch1: %{name}-pyc.patch
Patch2: gio.patch
+Patch3: %{name}-pycairo.patch
URL: http://www.pygtk.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake >= 1:1.7
@@ -130,6 +132,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -161,18 +164,14 @@
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%if %{with python3}
-cd py3
-%{__make} -j 1 install \
+%{__make} -C py3 -j 1 install \
DESTDIR=$RPM_BUILD_ROOT \
TARGET_DIR=%{_gtkdocdir}/%{module}
-cd ..
%endif
%if %{with python2}
-cd py2
-%{__make} -j 1 install \
+%{__make} -C py2 -j 1 install \
DESTDIR=$RPM_BUILD_ROOT \
TARGET_DIR=%{_gtkdocdir}/%{module}
-cd ..
%endif
cp -a examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -289,6 +288,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.65 2011/05/22 19:03:49 qboosh
+- added pycairo patch (fixes build with python3-based pycairo 1.10.0)
+
Revision 1.64 2011/04/18 20:40:21 wiget
- up to 2.28.4
================================================================
Index: packages/python-pygobject/python-pygobject-pycairo.patch
diff -u /dev/null packages/python-pygobject/python-pygobject-pycairo.patch:1.1
--- /dev/null Sun May 22 21:03:55 2011
+++ packages/python-pygobject/python-pygobject-pycairo.patch Sun May 22
21:03:49 2011
@@ -0,0 +1,24 @@
+--- pygobject-2.28.4/gi/pygi-foreign-cairo.c.orig 2011-04-18
17:36:47.000000000 +0200
++++ pygobject-2.28.4/gi/pygi-foreign-cairo.c 2011-05-22 20:57:19.521360594
+0200
+@@ -30,7 +30,9 @@
+ #include <pycairo/py3cairo.h>
+ #endif
+
++#if PY_VERSION_HEX < 0x03000000
+ Pycairo_CAPI_t *Pycairo_CAPI;
++#endif
+
+ #include "pygi-foreign.h"
+
+@@ -115,7 +117,11 @@
+ static PyMethodDef _gi_cairo_functions[] = {};
+ PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
+ {
++#if PY_VERSION_HEX < 0x03000000
+ Pycairo_IMPORT;
++#else
++ import_cairo();
++#endif
+ if (Pycairo_CAPI == NULL)
+ return PYGLIB_MODULE_ERROR_RETURN;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-pygobject/python-pygobject.spec?r1=1.64&r2=1.65&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
