Patchwork librsvg 2.32.1: fix loader packaging when using gtk >2.20

login
register
mail settings
Submitter Koen Kooi
Date June 9, 2011, 11:29 a.m.
Message ID <1307618973-32608-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/5599/
State New, archived
Headers show

Comments

Koen Kooi - June 9, 2011, 11:29 a.m.
When using the gtk+ from OE-core you would get:

WARNING: the following files were installed but not shipped in any package:
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Richard Purdie - June 9, 2011, 2:43 p.m.
On Thu, 2011-06-09 at 13:29 +0200, Koen Kooi wrote:
> When using the gtk+ from OE-core you would get:
> 
> WARNING: the following files were installed but not shipped in any package:
> WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 56c8800..a47afc6 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,7 +9,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gnome
 
@@ -30,8 +30,9 @@  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"
+	      ${datadir}/pixmaps/svg-viewer.svg \
+	      ${datadir}/themes"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so ${libdir}/gdk-pixbuf-2.0/*/*/*.so"
 FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
 			  ${libdir}/gtk-2.0/*/loaders/*.*a \
 			  ${libdir}/gtk-2.0/*/engines/*.*a"