[gcompris] Also fix deprecated errors caused by new librsvg

Hans de Goede jwrdegoede at fedoraproject.org
Sat Dec 10 09:11:27 UTC 2011


commit 5374f4387542b8ea8f64b64f23e75a5eb30fb3b1
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Dec 10 10:12:32 2011 +0100

    Also fix deprecated errors caused by new librsvg

 gcompris-11.09-deprecated1.patch |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/gcompris-11.09-deprecated1.patch b/gcompris-11.09-deprecated1.patch
index a92c5a6..7802b25 100644
--- a/gcompris-11.09-deprecated1.patch
+++ b/gcompris-11.09-deprecated1.patch
@@ -1026,3 +1026,35 @@ diff -up gcompris-11.09/src/wordsgame-activity/wordsgame.c~orig gcompris-11.09/s
  	{
  	  /* Set the plugin entry */
  	  gcomprisBoard->plugin=&menu_bp;
+diff -up gcompris-11.09/src/boards/py-mod-utils.c~ gcompris-11.09/src/boards/py-mod-utils.c
+--- gcompris-11.09/src/boards/py-mod-utils.c~	2011-10-03 21:49:56.000000000 +0200
++++ gcompris-11.09/src/boards/py-mod-utils.c	2011-12-10 10:10:33.168858590 +0100
+@@ -72,7 +72,13 @@ py_gc_svg_load(PyObject* self, PyObject*
+   /* Create and return the result */
+   pyresult = (PyObject*) pygobject_new((GObject*) result);
+ 
++/* rsvg.h only marks these deprecated with glib >= 2.31.0, and rsvg.h has no
++   version define itself */
++#if GLIB_CHECK_VERSION (2, 31, 0)
++  g_object_unref(result);
++#else
+   rsvg_handle_free(result);
++#endif
+ 
+   return(pyresult);
+ 
+diff -up gcompris-11.09/src/gcompris/gcompris.c~ gcompris-11.09/src/gcompris/gcompris.c
+--- gcompris-11.09/src/gcompris/gcompris.c~	2011-12-10 08:31:19.000000000 +0100
++++ gcompris-11.09/src/gcompris/gcompris.c	2011-12-10 10:09:24.233720477 +0100
+@@ -2036,7 +2036,11 @@ main (int argc, char *argv[])
+   /* Gdk-Pixbuf */
+   gdk_rgb_init();
+ 
++/* rsvg.h only marks these deprecated with glib >= 2.31.0, and rsvg.h has no
++   version define itself */
++#if !GLIB_CHECK_VERSION (2, 31, 0)
+   rsvg_init();
++#endif
+ 
+   setup_window ();
+ 


More information about the scm-commits mailing list