librsvg: fix postinst, remove stale versions. Closes #1926

5 files changed, 8 insertions, 88 deletions

diff --git a/packages/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb
deleted file mode 100644
index 4cddc1f2dd..0000000000
--- a/packages/librsvg/librsvg_2.11.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
-LICENSE = "LGPL"
-PR = "r1"
-
-EXTRA_OECONF = "--disable-mozilla-plugin"
-
-inherit autotools pkgconfig gnome
-
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_rsvg = "${bindir}/rsvg ${bindir}/rsvg-view ${datadir}/pixmaps/svg-viewer.svg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
-
-EXTRA_OECONF = "--disable-mozilla-plugin"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/librsvg/librsvg_2.16.0.bb b/packages/librsvg/librsvg_2.16.0.bb
deleted file mode 100644
index 230ba1b43f..0000000000
--- a/packages/librsvg/librsvg_2.16.0.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
-LICENSE = "LGPL"
-PR = "r1"
-
-EXTRA_OECONF = "--disable-mozilla-plugin"
-
-inherit autotools pkgconfig gnome
-
-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/*.la \
-			  ${libdir}/gtk-2.0/*/*.la"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug"
-
-EXTRA_OECONF = "--disable-mozilla-plugin"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/librsvg/librsvg_2.16.1.bb b/packages/librsvg/librsvg_2.16.1.bb
index 273992de29..c7154e7157 100644
--- a/packages/librsvg/librsvg_2.16.1.bb
+++ b/packages/librsvg/librsvg_2.16.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gnome
 
@@ -24,6 +24,13 @@ FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
 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
+        gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+}
+
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/librsvg/librsvg_2.6.5.bb b/packages/librsvg/librsvg_2.6.5.bb
deleted file mode 100644
index e5b691a000..0000000000
--- a/packages/librsvg/librsvg_2.6.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libart-lgpl libxml2 popt"
-LICENSE = "LGPL"
-PR = "r3"
-
-inherit autotools pkgconfig gnome
-
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_rsvg = "${bindir}/rsvg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/librsvg-2/librsvg/
-	install -m 0644 rsvg.h ${STAGING_INCDIR}/librsvg-2/librsvg/
-	install -m 0644 librsvg-features.h ${STAGING_INCDIR}/librsvg-2/librsvg/
-	oe_libinstall -so -a librsvg-2 ${STAGING_LIBDIR}
-}
diff --git a/packages/librsvg/librsvg_2.9.5.bb b/packages/librsvg/librsvg_2.9.5.bb
deleted file mode 100644
index a462390182..0000000000
--- a/packages/librsvg/librsvg_2.9.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Library for rendering SVG files"
-SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
-LICENSE = "LGPL"
-PR = "r3"
-
-inherit autotools pkgconfig gnome
-
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg"
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_rsvg = "${bindir}/rsvg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/librsvg-2/librsvg/
-	install -m 0644 rsvg.h ${STAGING_INCDIR}/librsvg-2/librsvg/
-	install -m 0644 librsvg-features.h ${STAGING_INCDIR}/librsvg-2/librsvg/
-	oe_libinstall -so -a librsvg-2 ${STAGING_LIBDIR}
-}