r52328 - in /desktop/experimental/librsvg/debian: changelog librsvg.thumbnailer librsvg2-2.install librsvg2-common.install patches/add-thumbnailer-file.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Thu Apr  6 11:36:36 2017
New Revision: 52328

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52328
Log:
Use patch submitted to GNOME instead

Added:
    desktop/experimental/librsvg/debian/patches/add-thumbnailer-file.patch
Removed:
    desktop/experimental/librsvg/debian/librsvg.thumbnailer
Modified:
    desktop/experimental/librsvg/debian/changelog
    desktop/experimental/librsvg/debian/librsvg2-2.install
    desktop/experimental/librsvg/debian/librsvg2-common.install
    desktop/experimental/librsvg/debian/patches/series

Modified: desktop/experimental/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/changelog?rev=52328&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/changelog	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/changelog	[utf-8] Thu Apr  6 11:36:36 2017
@@ -1,6 +1,7 @@
 librsvg (2.40.16-2) UNRELEASED; urgency=medium
 
-  * debian/librsvg.thumbnailer, debian/librsvg2-common.install:
+  * Add debian/patches/add-thumbnailer-file.patch,
+  * debian/librsvg-2-common.install:
     - Add .thumbnailer file so that svg thumbnails work with gnome-desktop3
       3.24.
 

Modified: desktop/experimental/librsvg/debian/librsvg2-2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/librsvg2-2.install?rev=52328&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/librsvg2-2.install	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/librsvg2-2.install	[utf-8] Thu Apr  6 11:36:36 2017
@@ -1,2 +1 @@
 usr/lib/*/lib*.so.*
-debian/librsvg.thumbnailer usr/share/thumbnailers

Modified: desktop/experimental/librsvg/debian/librsvg2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/librsvg2-common.install?rev=52328&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/librsvg2-common.install	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/librsvg2-common.install	[utf-8] Thu Apr  6 11:36:36 2017
@@ -1 +1,2 @@
 usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+usr/share/thumbnailers

Added: desktop/experimental/librsvg/debian/patches/add-thumbnailer-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/patches/add-thumbnailer-file.patch?rev=52328&op=file
==============================================================================
--- desktop/experimental/librsvg/debian/patches/add-thumbnailer-file.patch	(added)
+++ desktop/experimental/librsvg/debian/patches/add-thumbnailer-file.patch	[utf-8] Thu Apr  6 11:36:36 2017
@@ -0,0 +1,46 @@
+From 998ce1dd30f5c2760e08755bacd9b6f74c3ab64e Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Thu, 6 Apr 2017 07:15:41 -0400
+Subject: [PATCH] Add .thumbnailer file for gdk-pixbuf-loader
+
+This is required for svg thumbnails to work with gnome-desktop 3.24
+
+https://bugzilla.gnome.org/show_bug.cgi?id=778666
+---
+ gdk-pixbuf-loader/Makefile.am            |    9 +++++++++
+ gdk-pixbuf-loader/librsvg.thumbnailer.in |    4 ++++
+ 2 files changed, 13 insertions(+)
+ create mode 100644 gdk-pixbuf-loader/librsvg.thumbnailer.in
+
+--- a/gdk-pixbuf-loader/Makefile.am
++++ b/gdk-pixbuf-loader/Makefile.am
+@@ -51,6 +51,14 @@ EXTRA_rsvg_loader_DEPENDENCIES = libpixb
+ gdk-pixbuf-loaders: Makefile
+ 	$(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
+ 
++thumbnailerdir = $(datadir)/thumbnailers/
++thumbnailer_DATA = librsvg.thumbnailer
++librsvg.thumbnailer: librsvg.thumbnailer.in
++	$(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|" \
++	$< > $@
++
++EXTRA_DIST = librsvg.thumbnailer.in
++
+ install-data-hook:
+ 	if test -z "$(DESTDIR)"; then \
+ 		$(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \
+@@ -59,6 +67,7 @@ install-data-hook:
+ 
+ CLEANFILES = \
+ 	gdk-pixbuf.loaders \
++	$(thumbnailer_DATA) \
+ 	$(NULL)
+ 
+ DISTCLEANFILES = \
+--- /dev/null
++++ b/gdk-pixbuf-loader/librsvg.thumbnailer.in
+@@ -0,0 +1,4 @@
++[Thumbnailer Entry]
++TryExec=@bindir@/gdk-pixbuf-thumbnailer
++Exec=@bindir@/gdk-pixbuf-thumbnailer -s %s %u %o
++MimeType=image/svg+xml;

Modified: desktop/experimental/librsvg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/librsvg/debian/patches/series?rev=52328&op=diff
==============================================================================
--- desktop/experimental/librsvg/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/librsvg/debian/patches/series	[utf-8] Thu Apr  6 11:36:36 2017
@@ -1 +1,2 @@
 10_rsvg-gz.patch
+add-thumbnailer-file.patch