Accepting request 48432 from home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/48432
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=28

librsvg-gdkkeysym-compat.patch

@@ -0,0 +1,16 @@
+diff --git a/test-display.c b/test-display.c
+index ff12945..9bead01 100644
+--- a/test-display.c
++++ b/test-display.c
+@@ -29,7 +29,11 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
++#if GTK_CHECK_VERSION(2,21,8)
++#include <gdk/gdkkeysyms-compat.h>
++#else
+ #include <gdk/gdkkeysyms.h>
++#endif
+ 
+ #define DEFAULT_WIDTH  640
+ #define DEFAULT_HEIGHT 480

librsvg.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 18 17:12:53 CEST 2010 - vuntz@opensuse.org
+
+- Add librsvg-gdkkeysym-compat.patch to fix build with recent
+  versions of GTK+.
+
 -------------------------------------------------------------------
 Fri Sep 10 00:06:06 CEST 2010 - vuntz@opensuse.org
 

librsvg.spec

@@ -32,6 +32,8 @@ Patch0:         librsvg-gdk-pixbuf-query-loaders-64.patch
 Patch1:         env-paths.diff
 # PATCH-FIX-UPSTREAM librsvg-gdk-pixbuf-render-gtk3.patch bgo#626605 vuntz@opensuse.org -- Fix build with recent gtk+ 3. The patch is technically correct, but suboptimal; see comments in bugzilla. Still, okay for us as we don't use this engine by default.
 Patch2:         librsvg-gdk-pixbuf-render-gtk3.patch
+# PATCH-FIX-UPSTREAM librsvg-gdkkeysym-compat.patch bgo#629881 vuntz@opensuse.org -- Fix build with recent versions of gtk+
+Patch3:         librsvg-gdkkeysym-compat.patch
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
@@ -136,6 +138,7 @@ touch aclocal.m4
 %endif
 %patch1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure\