diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2015-08-16 18:05:11 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2015-08-16 18:05:11 +0200 |
| commit | 0efae36910ae7c234743e047f9eb7d1ae444e714 (patch) | |
| tree | 31a0843f8271d69a0b374f1919055eb37dfd9780 | |
| parent | 452bbe706c69d57ee2b91fa93cc000bdc8067117 (diff) | |
recipes/librsvg: Bump to 2.40.10
| -rw-r--r-- | recipes/librsvg.recipe | 2 | ||||
| -rw-r--r-- | recipes/librsvg/option-enable-disable-gtk.patch | 32 |
2 files changed, 14 insertions, 20 deletions
diff --git a/recipes/librsvg.recipe b/recipes/librsvg.recipe index 121edae6..a3a2b347 100644 --- a/recipes/librsvg.recipe +++ b/recipes/librsvg.recipe @@ -2,7 +2,7 @@ class Recipe(recipe.Recipe): name = 'librsvg' - version = '2.40.9' + version = '2.40.10' licenses = [License.LGPLv2] deps = ['libcroco', 'gdk-pixbuf', 'vala-m4', 'gobject-introspection-m4', 'pango', 'cairo'] autoreconf = True diff --git a/recipes/librsvg/option-enable-disable-gtk.patch b/recipes/librsvg/option-enable-disable-gtk.patch index dc3914dd..091d4214 100644 --- a/recipes/librsvg/option-enable-disable-gtk.patch +++ b/recipes/librsvg/option-enable-disable-gtk.patch @@ -1,24 +1,17 @@ -From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 19 Nov 2013 16:00:29 +0000 -Subject: [PATCH] configure: add option to enable/disable use of GTK+ +From 84d2396821c24c8b8608d870a6bcf81b8463ca55 Mon Sep 17 00:00:00 2001 +From: Edward Hervey <bilboed@bilboed.com> +Date: Sat, 15 Aug 2015 12:30:43 +0200 +Subject: [PATCH] gtk3 fix -Distro packagers like predictability and automatically detected optional -dependencies are not predicable. Add a --with-gtk3 option (default to "auto") -for forcibly controlling whether GTK+ will be used or not. - -Signed-off-by: Ross Burton <ross.burton@intel.com> - -https://bugzilla.gnome.org/show_bug.cgi?id=712693 --- - configure.ac | 17 +++++++++++------ + configure.ac | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index f7a89dc..1498f72 100644 +index bf77f3a..01f46f4 100644 --- a/configure.ac +++ b/configure.ac -@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) +@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) # GTK # =========================================================================== @@ -42,17 +35,18 @@ index f7a89dc..1498f72 100644 AC_SUBST([GTK3_BINARY_VERSION]) -AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) -+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) ++AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk_3" = "yes"]) dnl =========================================================================== dnl GDK-Pixbuf SVG loader -@@ -305,6 +310,6 @@ librsvg-$VERSION +@@ -289,6 +294,6 @@ librsvg-$VERSION Build introspectable bindings: ${found_introspection} Build Vala bindings: ${enable_vala} Build GdkPixbuf loader: ${enable_pixbuf_loader} -- GTK 3.0: ${have_gtk_3} -+ GTK 3.0: ${with_gtk3} +- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} ++ GTK+ $GTK3_REQUIRED or later: ${with_gtk_3} Build miscellaenous tools: ${build_misc_tools} " -- -1.7.10.4
\ No newline at end of file +2.4.3 + |