librsvg: upgrade to 2.40.0
PATCH 1/1 librsvg: upgrade to 2.40.0
Add local-m4.patch and install a local vapigen.m4 so that we can autoreconf without needing Vala installed.
Refresh build dependencies removing stale recipes and adding libcroco as it's a mandatory dependency now.
Explicitly disable Vala, with a patch from upstream until 2.40.1.
The GTK+ 2 theme engine has been removed, delete all traces of it.
Add a patch to make GTK+ use deterministic, and a disabled PACKAGECONFIG for it.
Enable parallel make, as some testing shows that it works fine.
Drop librsvg-CVE-2011-3146, merged upstream. Drop doc_Makefile.patch, our gtk-doc.mk isn't buggy and this isn't needed anymore.
Merge multiple -dev and -dbg packages into ${PN}-dev and -dbg, and remove the loader module .a and .la files as they are pointless.
--- .../librsvg/librsvg-2.32.1/doc_Makefile.patch | 19 - .../librsvg-2.32.1/librsvg-CVE-2011-3146.patch | 1088 -------------------- .../recipes-gnome/librsvg/librsvg/gtk-option.patch | 59 ++ meta/recipes-gnome/librsvg/librsvg/local-m4.patch | 32 + meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | 96 ++ meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 58 -- meta/recipes-gnome/librsvg/librsvg_2.40.0.bb | 56 + 7 files changed, 243 insertions(+), 1165 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch delete mode 100644 meta/recipes-gnome/librsvg/librsvg-2.32.1/librsvg-CVE-2011-3146.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg/gtk-option.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg/local-m4.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg/vapigen.m4 delete mode 100644 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb create mode 100644 meta/recipes-gnome/librsvg/librsvg_2.40.0.bb
meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch deleted +0 -19
@@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Automake complains about using += before setting with = - -Signed-off-by: Saul Wold <[email protected]> - -Index: librsvg-2.32.0/doc/Makefile.am -=================================================================== ---- librsvg-2.32.0.orig/doc/Makefile.am 2010-11-24 13:13:28.000000000 -0800 -+++ librsvg-2.32.0/doc/Makefile.am 2010-11-24 13:13:46.161312119 -0800 -@@ -133,7 +133,7 @@ - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += \ -+EXTRA_DIST = \ - version.xml.in - - # Files not to distribute
meta/recipes-gnome/librsvg/librsvg-2.32.1/librsvg-CVE-2011-3146.patch deleted +0 -1088
1,088 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg/gtk-option.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg/local-m4.patch new file +32 -0
@@ -0,0 +1,32 @@ +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 <[email protected]> + +From 6c3b8eee243204678574e162b7d480f6f83b71e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <[email protected]> +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-@[email protected] + +-- +1.7.10.4 +
meta/recipes-gnome/librsvg/librsvg/vapigen.m4 new file +96 -0
96 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb deleted +0 -58
58 lines not on this page · raw message
meta/recipes-gnome/librsvg/librsvg_2.40.0.bb new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
1.7.10.4