rpms/gcompris/F-11 gcompris-9.1-pycairo_1.8.2.patch, NONE, 1.1 gcompris.spec, 1.50, 1.51 gcompris-9.0-goocanvas.patch, 1.1, NONE

[Johan Cwiklinski]

Author: trasher

Update of /cvs/pkgs/rpms/gcompris/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20490

Modified Files:
	gcompris.spec 
Added Files:
	gcompris-9.1-pycairo_1.8.2.patch 
Removed Files:
	gcompris-9.0-goocanvas.patch 
Log Message:
Quick fix to compile against pycairo-1.8.2

gcompris-9.1-pycairo_1.8.2.patch:
 goocanvasmodule.c |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE gcompris-9.1-pycairo_1.8.2.patch ---
diff -up gcompris-9.1/src/boards/goocanvasmodule.c.patch gcompris-9.1/src/boards/goocanvasmodule.c
--- gcompris-9.1/src/boards/goocanvasmodule.c.patch	2010-01-25 15:10:46.789933576 +0100
+++ gcompris-9.1/src/boards/goocanvasmodule.c	2010-01-25 15:11:38.953792442 +0100
@@ -35,11 +35,7 @@ _cairo_matrix_to_gvalue(GValue *value, P
 static PyObject *
 _cairo_pattern_from_gvalue(const GValue *value)
 {
-#if PYCAIRO_VERSION < 1008
     return PycairoPattern_FromPattern(cairo_pattern_reference((cairo_pattern_t *) g_value_get_boxed(value)));
-#else
-    return PycairoPattern_FromPattern(cairo_pattern_reference((cairo_pattern_t *) g_value_get_boxed(value)), NULL);
-#endif
 }
 
 static int


Index: gcompris.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/F-11/gcompris.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gcompris.spec	25 Jan 2010 12:31:30 -0000	1.50
+++ gcompris.spec	25 Jan 2010 15:19:40 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           gcompris
 Version:        9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
@@ -8,7 +8,7 @@ URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-9.0-icon.patch
 #Fix to suits old pycairo versions
-Patch1:         gcompris-9.0-goocanvas.patch
+Patch1:         gcompris-9.1-pycairo_1.8.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -540,6 +540,9 @@ fi
 
 
 %changelog
+* Mon Jan 25 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.1-2
+- Fixed to compile against pycairo-1.8.2
+
 * Mon Jan 25 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.1-1
 - 9.1
 


--- gcompris-9.0-goocanvas.patch DELETED ---