diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2012-09-05 19:22:10 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2012-09-05 19:22:10 +0000 |
commit | ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d (patch) | |
tree | baa664b9dab0dc8f05fa2744b3a968ff5a974350 /x11-libs/gtk+/files | |
parent | remove, in portage now (diff) | |
download | suka-ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d.tar.gz suka-ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d.tar.bz2 suka-ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d.zip |
Remove lots of outdated stuff, use gnome overlay instead
svn path=/; revision=348
Diffstat (limited to 'x11-libs/gtk+/files')
-rw-r--r-- | x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch | 81 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch | 39 | ||||
-rw-r--r-- | x11-libs/gtk+/files/settings.ini | 4 |
3 files changed, 0 insertions, 124 deletions
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 7f5d0a1..0000000 --- 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 2e052d9..0000000 --- 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/settings.ini b/x11-libs/gtk+/files/settings.ini deleted file mode 100644 index a65c0a8..0000000 --- a/x11-libs/gtk+/files/settings.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Settings] -gtk-theme-name = Adwaita -gtk-icon-theme-name = gnome -gtk-cursor-theme-name = Adwaita |