diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-11 16:35:08 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-16 09:23:19 +0100 |
| commit | 54fc08789321168026d4138fb6292cb6657e7ee5 (patch) | |
| tree | 951020ecf1896756c8f660e0a4a07486e3bfcaa1 /meta/recipes-gnome | |
| parent | 9d8062a0953f03089f751af435c18f5174e1ce67 (diff) | |
| download | openembedded-core-54fc08789321168026d4138fb6292cb6657e7ee5.tar.gz openembedded-core-54fc08789321168026d4138fb6292cb6657e7ee5.tar.bz2 openembedded-core-54fc08789321168026d4138fb6292cb6657e7ee5.zip | |
librsvg: Upgrade 2.40.9 -> 2.40.10
Rebase gtk-option.patch
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.40.10.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.40.9.bb) | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch index 3835015ce2..e6af481ef4 100644 --- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch @@ -1,6 +1,6 @@ -From 85d4af4451283f388e1e101ee4710bb19854154d Mon Sep 17 00:00:00 2001 +From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Fri, 10 Apr 2015 16:49:43 +0300 +Date: Tue, 11 Aug 2015 16:25:38 +0300 Subject: [PATCH] configure: add option to enable/disable use of GTK+ Distro packagers like predictability and automatically detected optional @@ -11,8 +11,7 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] Signed-off-by: Ross Burton <ross.burton@intel.com> - -Forward-ported to 2.40.9 +Forward-ported to 2.40.10 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- @@ -20,7 +19,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index e86c052..16b0e34 100644 +index bf77f3a..ca77de8 100644 --- a/configure.ac +++ b/configure.ac @@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) @@ -55,8 +54,8 @@ index e86c052..16b0e34 100644 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} " -- diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb index 9a14f29ca2..0ac323e4ea 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.10.bb @@ -16,8 +16,8 @@ GNOME_COMPRESS_TYPE = "xz" SRC_URI += "file://gtk-option.patch" -SRC_URI[archive.md5sum] = "31df15e3beaa8fbbf538ca3c52b400d2" -SRC_URI[archive.sha256sum] = "13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a" +SRC_URI[archive.md5sum] = "fadebe2e799ab159169ee3198415ff85" +SRC_URI[archive.sha256sum] = "965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479" EXTRA_OECONF = "--disable-introspection --disable-vala" |