r47058 - in /desktop/unstable/librsvg/debian/patches: 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch 20_rsvg_compat.patch 30_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Nov 17 16:01:22 2015
New Revision: 47058

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47058
Log:
Make sure the patches actually apply cleanly

Added:
    desktop/unstable/librsvg/debian/patches/01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
      - copied unchanged from r47057, desktop/unstable/librsvg/debian/patches/30_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
Removed:
    desktop/unstable/librsvg/debian/patches/30_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
Modified:
    desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch
    desktop/unstable/librsvg/debian/patches/series

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=47058&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 Nov 17 16:01:22 2015
@@ -1,17 +1,17 @@
 Index: librsvg-2.40.11/rsvg-convert.c
 ===================================================================
---- librsvg-2.40.11.orig/rsvg-convert.c	2015-10-08 12:52:09.876413251 +0200
-+++ librsvg-2.40.11/rsvg-convert.c	2015-10-08 12:57:14.541733808 +0200
-@@ -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=47058&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/series	[utf-8] Tue Nov 17 16:01:22 2015
@@ -1,3 +1,3 @@
+01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
 10_rsvg-gz.patch
 20_rsvg_compat.patch
-30_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch