r40302 - in /desktop/wheezy/gtk+3.0/debian: changelog patches/001_use_data_uris_for_symbolic_icons.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Dec  4 13:08:53 2013
New Revision: 40302

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40302
Log:
Workaround new behaviour of librsvg (which implemented an origin
policy) by loading the file icon via a data: URI.

Added:
    desktop/wheezy/gtk+3.0/debian/patches/001_use_data_uris_for_symbolic_icons.patch
Modified:
    desktop/wheezy/gtk+3.0/debian/changelog
    desktop/wheezy/gtk+3.0/debian/patches/series

Modified: desktop/wheezy/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gtk%2B3.0/debian/changelog?rev=40302&op=diff
==============================================================================
--- desktop/wheezy/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/wheezy/gtk+3.0/debian/changelog	[utf-8] Wed Dec  4 13:08:53 2013
@@ -1,3 +1,11 @@
+gtk+3.0 (3.4.2-7) stable; urgency=low
+
+  [ Raphaël Geissert ]
+  * Workaround new behaviour of librsvg (which implemented an origin
+    policy) by loading the file icon via a data: URI.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 04 Dec 2013 14:06:28 +0100
+
 gtk+3.0 (3.4.2-6) unstable; urgency=low
 
   * Team upload.

Added: desktop/wheezy/gtk+3.0/debian/patches/001_use_data_uris_for_symbolic_icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gtk%2B3.0/debian/patches/001_use_data_uris_for_symbolic_icons.patch?rev=40302&op=file
==============================================================================
--- desktop/wheezy/gtk+3.0/debian/patches/001_use_data_uris_for_symbolic_icons.patch	(added)
+++ desktop/wheezy/gtk+3.0/debian/patches/001_use_data_uris_for_symbolic_icons.patch	[utf-8] Wed Dec  4 13:08:53 2013
@@ -0,0 +1,37 @@
+Index: gtk+3.0-3.4.2/gtk/gtkicontheme.c
+===================================================================
+--- gtk+3.0-3.4.2.orig/gtk/gtkicontheme.c	2012-05-02 14:46:50.000000000 +0200
++++ gtk+3.0-3.4.2/gtk/gtkicontheme.c	2013-11-27 14:16:27.393901153 +0100
+@@ -3170,6 +3170,8 @@ _gtk_icon_info_load_symbolic_internal (G
+   GdkPixbuf *pixbuf;
+   gchar *data;
+   gchar *success, *warning, *err;
++  gchar *file_data, *escaped_file_data;
++  gsize file_len;
+ 
+   /* css_fg can't possibly have failed, otherwise
+    * that would mean we have a broken style */
+@@ -3193,6 +3195,11 @@ _gtk_icon_info_load_symbolic_internal (G
+       err = gdk_color_to_css (&error_default_color);
+     }
+ 
++  if (!g_file_get_contents (icon_info->filename, &file_data, &file_len, NULL))
++    return NULL;
++
++  escaped_file_data = g_markup_escape_text (file_data, file_len);
++  g_free (file_data);
+ 
+   data = g_strconcat ("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+                       "<svg version=\"1.1\"\n"
+@@ -3214,9 +3221,10 @@ _gtk_icon_info_load_symbolic_internal (G
+                       "      fill: ", css_success ? css_success : success," !important;\n"
+                       "    }\n"
+                       "  </style>\n"
+-                      "  <xi:include href=\"", icon_info->filename, "\"/>\n"
++                      "  <xi:include href=\"data:text/xml,", escaped_file_data, "\"/>\n"
+                       "</svg>",
+                       NULL);
++  g_free (escaped_file_data);
+   g_free (warning);
+   g_free (err);
+   g_free (success);

Modified: desktop/wheezy/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gtk%2B3.0/debian/patches/series?rev=40302&op=diff
==============================================================================
--- desktop/wheezy/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/wheezy/gtk+3.0/debian/patches/series	[utf-8] Wed Dec  4 13:08:53 2013
@@ -1,3 +1,4 @@
+001_use_data_uris_for_symbolic_icons.patch
 015_default-fallback-icon-theme.patch
 016_no_offscreen_widgets_grabbing.patch
 017_no_offscreen_device_grabbing.patch