summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-26 19:49:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-29 09:52:55 +0000
commit48e196157225ca54320edb8a943e553bb4e2992e (patch)
tree4cbb3716203063c0325c729ae6c1e755b22afcbb /meta/recipes-gnome
parent4a4b36f9130e0ee5915bcbf617d84b8469d07ffb (diff)
downloadpoky-48e196157225ca54320edb8a943e553bb4e2992e.tar.gz
librsvg: upgrade to 2.40.1
(From OE-Core rev: 8f5f99a9c403d10e480d21f65147d9f67dfc60a0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/local-m4.patch32
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.1.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.40.0.bb)17
2 files changed, 8 insertions, 41 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/local-m4.patch b/meta/recipes-gnome/librsvg/librsvg/local-m4.patch
deleted file mode 100644
index e523076fd1..0000000000
--- a/meta/recipes-gnome/librsvg/librsvg/local-m4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1This patch is required to make autoreconf use the local macros (so that it can
2autoreconf without vala being installed).
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7From 6c3b8eee243204678574e162b7d480f6f83b71e6 Mon Sep 17 00:00:00 2001
8From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org>
9Date: Tue, 29 Oct 2013 13:05:39 -0700
10Subject: [PATCH] build: Use local macros to detect vala
11
12Fixes build when vala < 0.19 is present.
13---
14 Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile.am b/Makefile.am
18index d95f008..e881100 100644
19--- a/Makefile.am
20+++ b/Makefile.am
21@@ -3,7 +3,7 @@ SUBDIRS = . gdk-pixbuf-loader tests tools doc
22 NULL =
23 BUILT_SOURCES =
24
25-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
26+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
27
28 lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la
29
30--
311.7.10.4
32
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb
index de262f0793..4fc0e72f94 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.0.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.1.bb
@@ -15,11 +15,10 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
15GNOME_COMPRESS_TYPE = "xz" 15GNOME_COMPRESS_TYPE = "xz"
16 16
17SRC_URI += "file://gtk-option.patch \ 17SRC_URI += "file://gtk-option.patch \
18 file://local-m4.patch \
19 file://vapigen.m4" 18 file://vapigen.m4"
20 19
21SRC_URI[archive.md5sum] = "e16a84e9a86a18e5ca6ba95c512db6c6" 20SRC_URI[archive.md5sum] = "a31eb5d66c3fe94d888a6b17a287ea42"
22SRC_URI[archive.sha256sum] = "8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9" 21SRC_URI[archive.sha256sum] = "8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7"
23 22
24EXTRA_OECONF = "--disable-introspection --disable-vala" 23EXTRA_OECONF = "--disable-introspection --disable-vala"
25 24
@@ -29,13 +28,13 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-p
29# GTK+ test application (rsvg-view) 28# GTK+ test application (rsvg-view)
30PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3" 29PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3"
31 30
32# 2.40.1 should ship the tarball with local m4 macros, but until then drop a 31# The tarball doesn't ship with macros, so drop a vapigen in there so we don't
33# vapigen in there so we don't need to build vala to configure. 32# need to build vala to configure.
34do_configure_prepend() { 33do_configure_prepend() {
35 if test ! -e ${S}/m4/vapigen.m4; then 34 if test ! -e ${S}/m4/vapigen.m4; then
36 mkdir --parents ${S}/m4 35 mkdir --parents ${S}/m4
37 mv ${WORKDIR}/vapigen.m4 ${S}/m4/ 36 mv ${WORKDIR}/vapigen.m4 ${S}/m4/
38 fi 37 fi
39} 38}
40 39
41do_install_append() { 40do_install_append() {