r47355 - in /desktop/unstable/librsvg/debian: changelog patches/20_rsvg_compat.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Feb 16 23:34:22 2016
New Revision: 47355

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47355
Log:
Restore 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch.
The upstream patch 30_Don-t-crash-when-filters-don-t-exist.patch addresses
a different issue, so the revert is still necessary.

Modified:
    desktop/unstable/librsvg/debian/changelog
    desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch
    desktop/unstable/librsvg/debian/patches/series

Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=47355&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog	[utf-8] Tue Feb 16 23:34:22 2016
@@ -1,3 +1,11 @@
+librsvg (2.40.13-3) UNRELEASED; urgency=medium
+
+  * Restore 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch.
+    The upstream patch 30_Don-t-crash-when-filters-don-t-exist.patch addresses
+    a different issue, so the revert is still necessary.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 17 Feb 2016 00:32:25 +0100
+
 librsvg (2.40.13-2) unstable; urgency=medium
 
   * Replace 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch with

Modified: desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch?rev=47355&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch	[utf-8] Tue Feb 16 23:34:22 2016
@@ -1,17 +1,17 @@
-Index: librsvg-2.40.13/rsvg-convert.c
+Index: librsvg-2.40.11/rsvg-convert.c
 ===================================================================
---- librsvg-2.40.13.orig/rsvg-convert.c	2016-01-29 14:16:21.806607812 +0100
-+++ librsvg-2.40.13/rsvg-convert.c	2016-01-29 14:17:33.448096327 +0100
-@@ -140,6 +140,8 @@
+--- librsvg-2.40.11.orig/rsvg-convert.c	2015-11-17 16:59:27.709631303 +0100
++++ librsvg-2.40.11/rsvg-convert.c	2015-11-17 16:59:27.709631303 +0100
+@@ -126,6 +126,8 @@
+     RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
      RsvgDimensionData dimensions;
      FILE *output_file = stdout;
-     char *export_lookup_id;
 +    char *basename;
 +    gboolean rsvg_compat = FALSE;
  
  #ifdef G_OS_WIN32
      HANDLE handle;
-@@ -199,6 +201,27 @@
+@@ -183,6 +185,27 @@
          return 0;
      }
  
@@ -39,7 +39,7 @@
      if (output != NULL) {
          output_file = fopen (output, "wb");
          if (!output_file) {
-@@ -210,10 +233,6 @@
+@@ -194,10 +217,6 @@
          g_free (output);
      }
  

Modified: desktop/unstable/librsvg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/series?rev=47355&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/series	[utf-8] Tue Feb 16 23:34:22 2016
@@ -1,3 +1,4 @@
+01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
 10_rsvg-gz.patch
 20_rsvg_compat.patch
 30_Don-t-crash-when-filters-don-t-exist.patch