aboutsummaryrefslogtreecommitdiffstats
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-27 11:56:22 +0000
commit8f5f99a9c403d10e480d21f65147d9f67dfc60a0 (patch)
tree4c8e4d581fe978e98f4f3dba53a5a3095d038b76 /meta/recipes-gnome
parente24659fc039c9f54b841ed01c3d5ff407921398b (diff)
downloadopenembedded-core-contrib-8f5f99a9c403d10e480d21f65147d9f67dfc60a0.tar.gz
librsvg: upgrade to 2.40.1
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 @@
-This patch is required to make autoreconf use the local macros (so that it can
-autoreconf without vala being installed).
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 6c3b8eee243204678574e162b7d480f6f83b71e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org>
-Date: Tue, 29 Oct 2013 13:05:39 -0700
-Subject: [PATCH] build: Use local macros to detect vala
-
-Fixes build when vala < 0.19 is present.
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d95f008..e881100 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,7 @@ SUBDIRS = . gdk-pixbuf-loader tests tools doc
- NULL =
- BUILT_SOURCES =
-
--ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
-+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-
- lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la
-
---
-1.7.10.4
-
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
GNOME_COMPRESS_TYPE = "xz"
SRC_URI += "file://gtk-option.patch \
- file://local-m4.patch \
file://vapigen.m4"
-SRC_URI[archive.md5sum] = "e16a84e9a86a18e5ca6ba95c512db6c6"
-SRC_URI[archive.sha256sum] = "8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9"
+SRC_URI[archive.md5sum] = "a31eb5d66c3fe94d888a6b17a287ea42"
+SRC_URI[archive.sha256sum] = "8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7"
EXTRA_OECONF = "--disable-introspection --disable-vala"
@@ -29,13 +28,13 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-p
# GTK+ test application (rsvg-view)
PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3"
-# 2.40.1 should ship the tarball with local m4 macros, but until then drop a
-# vapigen in there so we don't need to build vala to configure.
+# The tarball doesn't ship with macros, so drop a vapigen in there so we don't
+# need to build vala to configure.
do_configure_prepend() {
- if test ! -e ${S}/m4/vapigen.m4; then
- mkdir --parents ${S}/m4
- mv ${WORKDIR}/vapigen.m4 ${S}/m4/
- fi
+ if test ! -e ${S}/m4/vapigen.m4; then
+ mkdir --parents ${S}/m4
+ mv ${WORKDIR}/vapigen.m4 ${S}/m4/
+ fi
}
do_install_append() {