From 4127ac1ba230699b2f4a6be45db87fb46cf9a2d9 Mon Sep 17 00:00:00 2001
From: Saul Wold <Saul.Wold@intel.com>
Date: Wed, 24 Nov 2010 12:21:31 -0800
Subject: librsvg: Update to version 2.32.0

Add doc/Makefile patch

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
---
 .../librsvg/librsvg-2.32.0/doc_Makefile.patch      | 17 +++++++++
 meta/recipes-gnome/librsvg/librsvg_2.26.3.bb       | 41 ---------------------
 meta/recipes-gnome/librsvg/librsvg_2.32.0.bb       | 43 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch
 delete mode 100644 meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
 create mode 100644 meta/recipes-gnome/librsvg/librsvg_2.32.0.bb

(limited to 'meta')

diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch
new file mode 100644
index 000000000..217573bd2
--- /dev/null
+++ b/meta/recipes-gnome/librsvg/librsvg-2.32.0/doc_Makefile.patch
@@ -0,0 +1,17 @@
+Automake complains about using += before setting with =
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+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
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
deleted file mode 100644
index 41e23b1d7..000000000
--- a/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/librsvg/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6"
-
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco cairo libxml2 popt"
-PR = "r0"
-
-EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
-
-inherit autotools pkgconfig gnome
-
-do_configure_prepend () {
-	echo "CLEANFILES=" > gtk-doc.make
-}
-
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_rsvg = "${bindir}/rsvg \
-	      ${bindir}/rsvg-view \
-	      ${bindir}/rsvg-convert \
-	      ${datadir}/pixmaps/svg-viewer.svg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
-			  ${libdir}/gtk-2.0/*/loaders/*.*a \
-			  ${libdir}/gtk-2.0/*/engines/*.*a"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
-                          ${libdir}/gtk-2.0/*/*/.debug"
-
-pkg_postinst_librsvg-gtk() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-test -x ${bindir}/gdk-pixbuf-query-loaders && { gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders ; }
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
-}
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb
new file mode 100644
index 000000000..0228798bc
--- /dev/null
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.0.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Library for rendering SVG files"
+HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/librsvg/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6"
+
+SECTION = "x11/utils"
+DEPENDS = "gtk+ libcroco cairo libxml2 popt"
+PR = "r0"
+
+SRC_URI += "file://doc_Makefile.patch"
+
+EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
+
+inherit autotools pkgconfig gnome
+
+do_configure_prepend () {
+	echo "CLEANFILES=" > gtk-doc.make
+}
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg \
+	      ${bindir}/rsvg-view \
+	      ${bindir}/rsvg-convert \
+	      ${datadir}/pixmaps/svg-viewer.svg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
+			  ${libdir}/gtk-2.0/*/loaders/*.*a \
+			  ${libdir}/gtk-2.0/*/engines/*.*a"
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+                          ${libdir}/gtk-2.0/*/*/.debug"
+
+pkg_postinst_librsvg-gtk() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+test -x ${bindir}/gdk-pixbuf-query-loaders && { gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders ; }
+test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
+}
-- 
cgit v1.2.3