From dda52e251c56b83b69bb65f5dbc6a66ff4799029a542cb084007aabf9c005b3b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 18 Sep 2010 15:24:28 +0000 Subject: [PATCH 1/3] 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 | 16 ++++++++++++++++ librsvg.changes | 6 ++++++ librsvg.spec | 3 +++ 3 files changed, 25 insertions(+) create mode 100644 librsvg-gdkkeysym-compat.patch diff --git a/librsvg-gdkkeysym-compat.patch b/librsvg-gdkkeysym-compat.patch new file mode 100644 index 0000000..1fec2d1 --- /dev/null +++ b/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 + #include ++#if GTK_CHECK_VERSION(2,21,8) ++#include ++#else + #include ++#endif + + #define DEFAULT_WIDTH 640 + #define DEFAULT_HEIGHT 480 diff --git a/librsvg.changes b/librsvg.changes index 20d521b..fb20c7f 100644 --- a/librsvg.changes +++ b/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 diff --git a/librsvg.spec b/librsvg.spec index 4bd24e7..bd07ad3 100644 --- a/librsvg.spec +++ b/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\ From 15191bd50cb8223775029ab4efd5580aa618e004d704fe607799a88603450631 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 23 Sep 2010 22:06:08 +0000 Subject: [PATCH 2/3] Accepting request 48943 from GNOME:Factory checked in (request 48943) OBS-URL: https://build.opensuse.org/request/show/48943 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=29 --- librsvg-gdkkeysym-compat.patch | 16 ---------------- librsvg.changes | 6 ------ librsvg.spec | 3 --- 3 files changed, 25 deletions(-) delete mode 100644 librsvg-gdkkeysym-compat.patch diff --git a/librsvg-gdkkeysym-compat.patch b/librsvg-gdkkeysym-compat.patch deleted file mode 100644 index 1fec2d1..0000000 --- a/librsvg-gdkkeysym-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 - #include -+#if GTK_CHECK_VERSION(2,21,8) -+#include -+#else - #include -+#endif - - #define DEFAULT_WIDTH 640 - #define DEFAULT_HEIGHT 480 diff --git a/librsvg.changes b/librsvg.changes index fb20c7f..20d521b 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/librsvg.spec b/librsvg.spec index bd07ad3..4bd24e7 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -32,8 +32,6 @@ 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) @@ -138,7 +136,6 @@ touch aclocal.m4 %endif %patch1 %patch2 -p1 -%patch3 -p1 %build %configure\ From 40069a9cf2a2613d775314bc27870ad1bf44afc0c37bfc4fb053c8c16a879857 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 23 Sep 2010 22:06:09 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/librsvg revision 33.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=b67e19870c9cba90f875d3c6945fad1a --- librsvg-gdkkeysym-compat.patch | 16 ++++++++++++++++ librsvg.changes | 6 ++++++ librsvg.spec | 5 ++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 librsvg-gdkkeysym-compat.patch diff --git a/librsvg-gdkkeysym-compat.patch b/librsvg-gdkkeysym-compat.patch new file mode 100644 index 0000000..1fec2d1 --- /dev/null +++ b/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 + #include ++#if GTK_CHECK_VERSION(2,21,8) ++#include ++#else + #include ++#endif + + #define DEFAULT_WIDTH 640 + #define DEFAULT_HEIGHT 480 diff --git a/librsvg.changes b/librsvg.changes index 20d521b..fb20c7f 100644 --- a/librsvg.changes +++ b/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 diff --git a/librsvg.spec b/librsvg.spec index 4bd24e7..b3d754a 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -20,7 +20,7 @@ Name: librsvg Version: 2.31.0 -Release: 2 +Release: 3 License: GPLv2+ Summary: A Library for Rendering SVG Data Url: http://librsvg.sourceforge.net/ @@ -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\