drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

12 files changed, 0 insertions, 490 deletions

diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
deleted file mode 100644
index 3fe8cffd906a..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=536767
-
-Makes inkscape and claws-mail buildable again. Basically all packages still using
-GtkCList and single included headers.
---- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
- 
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
- 
- G_BEGIN_DECLS
diff --git a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch b/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
deleted file mode 100644
index 3cf777df5dc5..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Same as the 2.8 version, except removed gdk-pixbuf parts
-
---- gtk+-2.21.3.orig/gtk/gtkrc.c
-+++ gtk+-2.21.3/gtk/gtkrc.c
-@@ -364,7 +364,15 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	{
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	    {
-+	      g_free (result);
-+	      
-+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	    }
-+	}
-     }
- 
-   return result;
diff --git a/x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch b/x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch
deleted file mode 100644
index f07b91259ff0..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw
-https://bugs.gentoo.org/show_bug.cgi?id=372953
-https://bugzilla.gnome.org/show_bug.cgi?id=642085
-
---- gtk/Makefile.am~	2011-10-18 00:38:28.000000000 +0200
-+++ gtk/Makefile.am	2011-10-18 20:28:40.187219540 +0200
-@@ -32,7 +32,7 @@
- endif
- endif
- 
--INCLUDES =						\
-+INCLUDES_COMMON =						\
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
- 	-DGTK_LIBDIR=\"$(libdir)\"			\
- 	-DGTK_DATADIR=\"$(datadir)\"			\
-@@ -52,9 +52,18 @@
- 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
- 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
- 	$(GTK_DEBUG_FLAGS)				\
--	$(GTK_DEP_CFLAGS)				\
-+	$(GTK_DEP_CFLAGS)
-+
-+
-+INCLUDES=                                              \
-+	$(INCLUDES_COMMON)                              \
- 	$(INCLUDED_IMMODULE_DEFINE)
- 
-+
-+INCLUDES_GIR=                                          \
-+	$(INCLUDES_COMMON)                              \
-+	$(INCLUDED_IMMODULE_DEFINE)
-+	
- gtarget=$(gdktarget)
- 
- if PLATFORM_WIN32
-@@ -1016,7 +1025,7 @@
- endif
- Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
- Gtk_2_0_gir_CFLAGS = \
--		$(INCLUDES) \
-+		$(INCLUDES_GIR) \
- 		-UGDK_DISABLE_DEPRECATED \
- 		-UGTK_DISABLE_DEPRECATED \
- 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
diff --git a/x11-libs/gtk+/files/gtk+-3.10.7-clang.patch b/x11-libs/gtk+/files/gtk+-3.10.7-clang.patch
deleted file mode 100644
index 2f9afb42b201..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.10.7-clang.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9f1159a1a85e022717959b99ec3745f4c95543a7 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 14 Dec 2013 01:05:03 +0000
-Subject: Fix a compiler warning
-
-Don't return without a value from a non-void function.
----
-(limited to 'gtk/gtkselection.c')
-
-diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
-index e20d464..caec0dd 100644
---- a/gtk/gtkselection.c
-+++ b/gtk/gtkselection.c
-@@ -2295,7 +2295,7 @@ _gtk_selection_request (GtkWidget *widget,
-   gulong selection_max_size;
- 
-   if (event->requestor == NULL)
--    return;
-+    return FALSE;
- 
-   if (initialize)
-     gtk_selection_init ();
---
-cgit v0.9.2
diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
deleted file mode 100644
index 7f5d0a1f162f..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 14 Mar 2012 23:08:53 -0400
-Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested
- theme fails
-
-If a gtk3 application is run in gnome2 and the settings daemon uses
-xsettings to request a gtk2 theme with no gtk3 version (which is the
-case by default), then instead of failing to load any theme, we should
-attempt to fall back to the theme specified in settings.ini files.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654108
----
- gtk/gtksettings.c |   23 +++++++++++++++++++++++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index 2e17430..354ba34 100644
---- a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate
-   GtkCssProvider *theme_provider;
-   GtkCssProvider *key_theme_provider;
-   GtkStyleProperties *style;
-+  gchar *fallback_gtk_theme_name;
- };
- 
- typedef enum
-@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object)
-   if (priv->style)
-     g_object_unref (priv->style);
- 
-+  g_free (priv->fallback_gtk_theme_name);
-+
-   G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
- }
- 
-@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings             *settings,
-       if (pspec->param_id == PROP_COLOR_SCHEME)
-         merge_color_scheme (settings, &tmp_value, qvalue->source);
- 
-+      if (!g_strcmp0 (pspec->name, "gtk-theme-name") && qvalue->source == GTK_SETTINGS_SOURCE_DEFAULT)
-+        {
-+          g_free (priv->fallback_gtk_theme_name);
-+          priv->fallback_gtk_theme_name = g_value_dup_string (&tmp_value);
-+        }
-+
-       if (priv->property_values[pspec->param_id - 1].source <= qvalue->source)
-         {
-           g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 1].value);
-@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
-         }
-       i++;
-     }
-+
-+  g_free (priv->fallback_gtk_theme_name);
-+  priv->fallback_gtk_theme_name = NULL;
-+
-   g_object_thaw_notify (G_OBJECT (settings));
-   g_free (pspecs);
- }
-@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings)
- 
-       if (!provider)
-         provider = gtk_css_provider_get_named (theme_name, NULL);
-+
-+      /* If we failed, fall back to the theme from settings.ini */
-+      if (!provider && priv->fallback_gtk_theme_name && *priv->fallback_gtk_theme_name
-+          && g_strcmp0 (theme_name, priv->fallback_gtk_theme_name))
-+        {
-+          provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
-+
-+          if (!provider)
-+            provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL);
-+        }
-     }
- 
-   /* If we didn't find the named theme, fall back */
--- 
-1.7.8.5
-
diff --git a/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch b/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch
deleted file mode 100644
index 2e052d9a6216..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
-index 9e8e6b1..237a5b8 100644
---- a/gdk/wayland/gdkdevice-wayland.c
-+++ b/gdk/wayland/gdkdevice-wayland.c
-@@ -32,7 +32,7 @@
- #include "gdkdevicemanagerprivate.h"
- #include "gdkprivate-wayland.h"
- 
--#include <X11/extensions/XKBcommon.h>
-+#include <xkbcommon/xkbcommon.h>
- #include <X11/keysym.h>
- 
- #include <sys/time.h>
-diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
-index eca6f92..d59563a 100644
---- a/gdk/wayland/gdkdisplaymanager-wayland.c
-+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
-@@ -27,7 +27,7 @@
- 
- #include "gdkinternals.h"
- 
--#include <X11/extensions/XKBcommon.h>
-+#include <xkbcommon/xkbcommon.h>
- 
- typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager;
- typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass;
-diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
-index f3e9d3c..bc26a43 100644
---- a/gdk/wayland/gdkkeys-wayland.c
-+++ b/gdk/wayland/gdkkeys-wayland.c
-@@ -39,7 +39,7 @@
- #include "gdkdisplay-wayland.h"
- #include "gdkkeysprivate.h"
- 
--#include <X11/extensions/XKBcommon.h>
-+#include <xkbcommon/xkbcommon.h>
- 
- typedef struct _GdkWaylandKeymap          GdkWaylandKeymap;
- typedef struct _GdkWaylandKeymapClass     GdkWaylandKeymapClass;
diff --git a/x11-libs/gtk+/files/gtk+-3.4.4-isnan.patch b/x11-libs/gtk+/files/gtk+-3.4.4-isnan.patch
deleted file mode 100644
index 710c33b71d19..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.4.4-isnan.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d6aee922bb5da8254fafdf605951cf5b0150537d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 15 May 2012 13:09:24 +0200
-Subject: [PATCH] Bug 676087-configure.ac: isnan() and isinf() are macros, not
- functions
-
-The isnan() and isinf() are C99 macros not functions so use
-AC_CHECK_DECL instead of AC_CHECK_FUNCS for those.
----
- configure.ac       | 3 ++-
- gdk/fallback-c89.c | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 857d015..c801dd2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -751,7 +751,8 @@ AC_TYPE_UID_T
- 
- # Check for round(), rint(), isnan(), isinf() and nearbyint()
- AC_CHECK_LIB(m,round,,)
--AC_CHECK_FUNCS(round rint isnan isinf nearbyint)
-+AC_CHECK_FUNCS(round rint nearbyint)
-+AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
- 
- # Checks for gdkspawn
- AC_CHECK_HEADERS(crt_externs.h)
-diff --git a/gdk/fallback-c89.c b/gdk/fallback-c89.c
-index 35dea77..b150044 100644
---- a/gdk/fallback-c89.c
-+++ b/gdk/fallback-c89.c
-@@ -19,7 +19,7 @@
- 
- #include <float.h>
- 
--#ifndef HAVE_ISNAN
-+#ifndef HAVE_DECL_ISNAN
- /* it seems of the supported compilers only
-  * MSVC does not have isnan(), but it does
-  * have _isnan() which does the same as isnan()
-@@ -31,7 +31,7 @@ isnan (double x)
- }
- #endif
- 
--#ifndef HAVE_ISINF
-+#ifndef HAVE_DECL_ISINF
- /* Unfortunately MSVC does not have finite()
-  * but it does have _finite() which is the same
-  * as finite() except when x is a NaN
--- 
-1.7.12.4
-
diff --git a/x11-libs/gtk+/files/gtk+-3.6.3-darwin-gtksettings.patch b/x11-libs/gtk+/files/gtk+-3.6.3-darwin-gtksettings.patch
deleted file mode 100644
index 26835d82c100..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.6.3-darwin-gtksettings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-include gtksettings.h for gtk_settings_get_for_screen
-
-https://bugs.gentoo.org/show_bug.cgi?id=422541
-https://bugzilla.gnome.org/show_bug.cgi?id=704767
-
---- gtk/gtkdnd-quartz.c
-+++ gtk/gtkdnd-quartz.c
-@@ -41,6 +41,7 @@
- #include "gtkquartz.h"
- #include "gdk/quartz/gdkquartz.h"
- #include "gtkselectionprivate.h"
-+#include "gtksettings.h"
- 
- typedef struct _GtkDragSourceSite GtkDragSourceSite;
- typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
diff --git a/x11-libs/gtk+/files/gtk+-3.6.3-librsvg-2.39.patch b/x11-libs/gtk+/files/gtk+-3.6.3-librsvg-2.39.patch
deleted file mode 100644
index 42d3c9c05b18..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.6.3-librsvg-2.39.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From b26c7c4b74de9767e5a7f0b72b590fb78a9c3adf Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 16 Aug 2013 18:57:21 -0400
-Subject: [PATCH] Make symbolic icons work with the current rsvg
-
-The rsvg loader now restricts what external files it will
-allow to load from an svg. Thus our xinclude trick doesn't work
-anymore. To work around that, embed the payload in a  data: uri.
-This is somewhat ugly, but the best we could come up with.
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 3.6.3]
----
- gtk/gtkicontheme.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
-index 58b643f..fef4283 100644
---- a/gtk/gtkicontheme.c
-+++ b/gtk/gtkicontheme.c
-@@ -3174,6 +3174,8 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
-   gchar *data;
-   gchar *success, *warning, *err;
-   gchar *width, *height;
-+  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 */
-@@ -3197,10 +3199,15 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
-       err = gdk_color_to_css (&error_default_color);
-     }
- 
-+  if (!g_file_get_contents (icon_info->filename, &file_data, &file_len, NULL))
-+    return NULL;
-+
-   if (!icon_info->symbolic_pixbuf_size)
-     {
-       /* Fetch size from the original icon */
--      pixbuf = gdk_pixbuf_new_from_file (icon_info->filename, error);
-+      stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL);
-+      pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
-+      g_object_unref (stream);
- 
-       if (!pixbuf)
-         return NULL;
-@@ -3214,6 +3221,9 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
-   width = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->width);
-   height = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->height);
- 
-+  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"
-                       "     xmlns=\"http://www.w3.org/2000/svg\"\n"
-@@ -3234,9 +3244,10 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
-                       "      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);
--- 
-1.8.3.2
-
diff --git a/x11-libs/gtk+/files/gtk+-3.6.3-revert-recompute-font.patch b/x11-libs/gtk+/files/gtk+-3.6.3-revert-recompute-font.patch
deleted file mode 100644
index 6713d474cf61..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.6.3-revert-recompute-font.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0ac6138fe5d501258a552f7de0e3aad1420d204a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 5 Jan 2013 08:43:28 -0500
-Subject: [PATCH] Revert "stylecontext: Always recompute font"
-
-This reverts commit c3508c9fa3854a158c16da4b50e4cbcc321333b9.
-
-Causes segfaults when opening printing dialog.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=691186
----
- gtk/gtkstylecontext.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
-index bcbea77..9604c42 100644
---- a/gtk/gtkstylecontext.c
-+++ b/gtk/gtkstylecontext.c
-@@ -3519,12 +3519,15 @@ gtk_style_context_get_font (GtkStyleContext *context,
- 
-   /* Yuck, fonts are created on-demand but we don't return a ref.
-    * Do bad things to achieve this requirement */
--  gtk_style_context_get (context, state, "font", &description, NULL);
--  g_object_set_data_full (G_OBJECT (data->store),
--                          "font-cache-for-get_font",
--                          description,
--                          (GDestroyNotify) pango_font_description_free);
--
-+  description = g_object_get_data (G_OBJECT (data->store), "font-cache-for-get_font");
-+  if (description == NULL)
-+    {
-+      gtk_style_context_get (context, state, "font", &description, NULL);
-+      g_object_set_data_full (G_OBJECT (data->store),
-+                              "font-cache-for-get_font",
-+                              description,
-+                              (GDestroyNotify) pango_font_description_free);
-+    }
-   return description;
- }
- 
--- 
-1.8.1
-
diff --git a/x11-libs/gtk+/files/gtk+-3.6.3-stylecontext-font-crash.patch b/x11-libs/gtk+/files/gtk+-3.6.3-stylecontext-font-crash.patch
deleted file mode 100644
index faa0b776a244..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.6.3-stylecontext-font-crash.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 7f0b30d7d40acaaaa2ecda603903c00544232bb8 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sun, 6 Jan 2013 23:08:28 +0100
-Subject: [PATCH] stylecontext: Make font hack not crash
-
-It's a lot uglier now, but it shouldn't crash anymore.
-
-We must update the font description for animations, but we can't free it
-on query, because some paths call gtk_style_context_get_font() twice in
-a row without stopping the use of the first call. So us just creating a
-new font description all the time and unreffing the old one is not a
-good idea. So we just mere the new one into the old one.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=691186
----
- gtk/gtkstylecontext.c | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
-index bcbea77..f081361 100644
---- a/gtk/gtkstylecontext.c
-+++ b/gtk/gtkstylecontext.c
-@@ -3508,7 +3508,7 @@ gtk_style_context_get_font (GtkStyleContext *context,
- {
-   GtkStyleContextPrivate *priv;
-   StyleData *data;
--  PangoFontDescription *description;
-+  PangoFontDescription *description, *previous;
- 
-   g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
- 
-@@ -3520,10 +3520,22 @@ gtk_style_context_get_font (GtkStyleContext *context,
-   /* Yuck, fonts are created on-demand but we don't return a ref.
-    * Do bad things to achieve this requirement */
-   gtk_style_context_get (context, state, "font", &description, NULL);
--  g_object_set_data_full (G_OBJECT (data->store),
--                          "font-cache-for-get_font",
--                          description,
--                          (GDestroyNotify) pango_font_description_free);
-+  
-+  previous = g_object_get_data (G_OBJECT (data->store), "font-cache-for-get_font");
-+
-+  if (previous)
-+    {
-+      pango_font_description_merge (previous, description, TRUE);
-+      pango_font_description_free (description);
-+      description = previous;
-+    }
-+  else
-+    {
-+      g_object_set_data_full (G_OBJECT (data->store),
-+                              "font-cache-for-get_font",
-+                              description,
-+                              (GDestroyNotify) pango_font_description_free);
-+    }
- 
-   return description;
- }
--- 
-1.8.1
-
diff --git a/x11-libs/gtk+/files/gtk+-3.8.6-skip-filechooser-test.patch b/x11-libs/gtk+/files/gtk+-3.8.6-skip-filechooser-test.patch
deleted file mode 100644
index 32d934c9f987..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.8.6-skip-filechooser-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- gtk/tests/filechooser.c.orig	2013-10-18 18:26:11.247696989 +0200
-+++ gtk/tests/filechooser.c	2013-10-18 18:27:31.927762072 +0200
-@@ -1603,20 +1603,6 @@
-       NULL,			/* final_current_folder */
-       FOLDER_NAME_2		/* final_filename */
-     },
--    {
--      "select-folder-dialog-4",
--      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
--      FOLDER_NAME,		/* initial_current_folder */
--      NULL,			/* initial_filename */
--      TRUE,			/* open_dialog */
--      BUTTON,			/* what_to_tweak */
--      NULL,			/* tweak_current_folder */
--      FOLDER_NAME_2,		/* tweak_filename */
--      GTK_RESPONSE_ACCEPT,	/* dialog_response */
--      FALSE,			/* unselect_all */
--      NULL,			/* final_current_folder */
--      FOLDER_NAME_2		/* final_filename */
--    },
- 
-     /* Unselection tests */
-     {