x11-terms/gnome-terminal: 2.33.4 -> 2.33.5

* Add patch from upstream to remove libgnome dependency

4 files changed, 183 insertions, 71 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 5be0394a..83ec73c5 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
-AUX gnome-terminal-2.33.4-fix-gdk-targets.patch 1634 RMD160 ca1337becf8dbbfb4b43f2fb9fc4f0249e03c183 SHA1 26bba8b422fb841e28f6f52d26c8578398dcb14e SHA256 80f9cc1982cadc82c36e6363071f4d7e4ad9fca109dca17235d857914e8254c0
-DIST gnome-terminal-2.33.4.tar.bz2 2346375 RMD160 629b1d6e7e39aafdaca16e8a51114b7984dfbfa2 SHA1 396ef1d540660882a9cd61374c3f50894b53082e SHA256 7d99eafe7877978ebf41fc3ae589d1ba81c6ee49cbd6bad11f7431e52c385612
-EBUILD gnome-terminal-2.33.4.ebuild 1325 RMD160 f75f5bef8d2aec046234c6defbbb423af2e60f72 SHA1 2206c16276450a75f8f99d5edbf0ea1212156219 SHA256 d08599f80a1a54405de2c093545884c05f10e9a1501f091a49699ae95a278718
+AUX gnome-terminal-2.33.5-remove-libgnome-dep.patch 6681 RMD160 89c30690d4dd8820c51b3bbd5403792daf5d895a SHA1 9d5c340c4a341d02033d16e9a8a78e63ce154135 SHA256 5785a90b92653bef79bb8fbfeb6339adf83730f8eb73ce5c731b72793dda66ae
+DIST gnome-terminal-2.33.5.tar.bz2 2317829 RMD160 37e97619d453f11a38ca6de35f8aadd89529f5e9 SHA1 b1074c032c5eef49d7c2d18b6eaadde8ba880af1 SHA256 3d69b5430ba1d54a20f93763fcf4b218c4ec97fee634b5947685dc9fb31e9612
+EBUILD gnome-terminal-2.33.5.ebuild 1418 RMD160 5dd7316e226fa309d9c6a76451d6d8c2c9655803 SHA1 73fe9c862549921d22e68b48b5710718ed62ae3a SHA256 6cee211e407b57cb30b1e902048113d2a49d120a0dacad9bc1c2d01cd4ffcf76
 EBUILD gnome-terminal-9999.ebuild 1325 RMD160 f75f5bef8d2aec046234c6defbbb423af2e60f72 SHA1 2206c16276450a75f8f99d5edbf0ea1212156219 SHA256 d08599f80a1a54405de2c093545884c05f10e9a1501f091a49699ae95a278718
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch
deleted file mode 100644
index 2c9932c4..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Gdk-3.0/Gtk-3.0 supports multiple targets now, and the "target" variable 
-no longer works. So, sort of hack around it for now?
-
----
---- configure.ac
-+++ configure.ac
-@@ -53,25 +53,28 @@
-   [with_gtk=2.0])
- AC_MSG_RESULT([$with_gtk])
- 
-+GDK_TARGETS=
- case "$with_gtk" in
-   2.0) GTK_API_VERSION=2.0
-        GTK_REQUIRED=2.18.0
-        VTE_PC_VERSION=
-        VTE_REQUIRED=0.26.0
-+       GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)
-        ;;
-   3.0) GTK_API_VERSION=3.0
-        GTK_REQUIRED=2.91.6
-        VTE_PC_VERSION=-2.90
-        VTE_REQUIRED=0.27.3
-+       GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
-        ;;
- esac
- 
--GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
--
--case "$GDK_TARGET" in
--  x11) PLATFORM_DEPS="x11" ;;
--  *) PLATFORM_DEPS="" ;;
--esac
-+PLATFORM_DEPS=
-+for i in $GDK_TARGETS; do
-+  if test "$i" = "x11"; then
-+    PLATFORM_DEPS="x11"
-+  fi
-+done
- 
- PKG_CHECK_MODULES([TERM],
-   [vte$VTE_PC_VERSION >= $VTE_REQUIRED
-@@ -92,11 +95,15 @@
- AC_ARG_WITH([smclient],
-   [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])],
-   [],
--  [case "$GDK_TARGET" in
--    x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
--    win32|quartz) with_smclient=$GDK_TARGET ;;
--    *) with_smclient=no ;;
--   esac])
-+  [for i in $GDK_TARGETS; do
-+    if test "$i" = "x11"; then
-+      with_smclient=xsmp SMCLIENT_PKGS="sm"
-+    elif test "$i" = "win32" -o "$i" = "quartz"; then
-+      with_smclient=$i
-+    else
-+      with_smclient=no
-+    fi
-+  done])
- AC_MSG_RESULT([$with_smclient])
- 
- if test "$with_smclient" != "no"; then
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch
new file mode 100644
index 00000000..fd69eae8
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch
@@ -0,0 +1,173 @@
+From e1ba3eea28f62c7b9b16a35b2d625aaf925f4802 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Thu, 3 Feb 2011 23:09:52 +0100
+Subject: [PATCH] Take system font from gsettings instead of gconf
+
+Bug #590774.
+---
+ configure.ac       |    2 ++
+ src/terminal-app.c |   52 ++++++++++++++++++++--------------------------------
+ 2 files changed, 22 insertions(+), 32 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 50bc8f9..414c602 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,6 +42,7 @@ AM_GLIB_GNU_GETTEXT
+ GLIB_REQUIRED=2.26.0
+ GIO_REQUIRED=2.26.0
+ GCONF_REQUIRED=2.31.3
++GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.0
+ 
+ AC_MSG_CHECKING([which gtk+ version to compile against])
+ AC_ARG_WITH([gtk],
+@@ -90,6 +91,7 @@ PKG_CHECK_MODULES([TERM],
+    gio-2.0 >= $GIO_REQUIRED
+    gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+    gconf-2.0 >= $GCONF_REQUIRED
++   gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+    $PLATFORM_DEPS])
+ 
+ # ********
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 3db56d8..ed79541 100644
+--- a/src/terminal-app.c
++++ b/src/terminal-app.c
+@@ -49,6 +49,8 @@
+ #endif
+ 
+ #define FALLBACK_PROFILE_ID "Default"
++#define DESKTOP_INTERFACE_SETTINGS_SCHEMA       "org.gnome.desktop.interface"
++#define MONOSPACE_FONT_KEY_NAME                 "monospace-font-name"
+ 
+ /* Settings storage works as follows:
+  *   /apps/gnome-terminal/global/
+@@ -97,10 +99,11 @@ struct _TerminalApp
+   guint profile_list_notify_id;
+   guint default_profile_notify_id;
+   guint encoding_list_notify_id;
+-  guint system_font_notify_id;
+   guint enable_mnemonics_notify_id;
+   guint enable_menu_accels_notify_id;
+ 
++  GSettings *desktop_interface_settings;
++
+   GHashTable *profiles;
+   char* default_profile_id;
+   TerminalProfile *default_profile;
+@@ -150,8 +153,6 @@ static TerminalApp *global_app = NULL;
+ /* Evil hack alert: this is exported from libgconf-2 but not in a public header */
+ extern gboolean gconf_spawn_daemon(GError** err);
+ 
+-#define MONOSPACE_FONT_DIR "/desktop/gnome/interface"
+-#define MONOSPACE_FONT_KEY MONOSPACE_FONT_DIR "/monospace_font_name"
+ #define DEFAULT_MONOSPACE_FONT ("Monospace 10")
+ 
+ #define ENABLE_MNEMONICS_KEY CONF_GLOBAL_PREFIX "/use_mnemonics"
+@@ -963,26 +964,14 @@ terminal_app_encoding_list_notify_cb (GConfClient *client,
+ }
+ 
+ static void
+-terminal_app_system_font_notify_cb (GConfClient *client,
+-                                    guint        cnxn_id,
+-                                    GConfEntry  *entry,
+-                                    gpointer     user_data)
++terminal_app_system_font_notify_cb (GSettings   *settings,
++                                    const char  *key,
++                                    TerminalApp *app)
+ {
+-  TerminalApp *app = TERMINAL_APP (user_data);
+-  GConfValue *gconf_value;
+   const char *font = NULL;
+   PangoFontDescription *font_desc;
+ 
+-  if (strcmp (gconf_entry_get_key (entry), MONOSPACE_FONT_KEY) != 0)
+-    return;
+-
+-  gconf_value = gconf_entry_get_value (entry);
+-  if (gconf_value &&
+-      gconf_value->type == GCONF_VALUE_STRING)
+-    font = gconf_value_get_string (gconf_value);
+-  if (!font)
+-    font = DEFAULT_MONOSPACE_FONT;
+-  g_assert (font != NULL);
++  g_settings_get (settings, MONOSPACE_FONT_KEY_NAME, "&s", &font);
+ 
+   font_desc = pango_font_description_from_string (font);
+   if (app->system_font_desc &&
+@@ -1390,6 +1379,16 @@ terminal_app_init (TerminalApp *app)
+ 
+   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
+ 
++  /* Terminal global settings */
++  app->desktop_interface_settings = g_settings_new (DESKTOP_INTERFACE_SETTINGS_SCHEMA);
++  terminal_app_system_font_notify_cb (app->desktop_interface_settings,
++                                      MONOSPACE_FONT_KEY_NAME,
++                                      app);
++  g_signal_connect (app->desktop_interface_settings,
++                    "changed::" MONOSPACE_FONT_KEY_NAME,
++                    G_CALLBACK (terminal_app_system_font_notify_cb),
++                    app);
++
+   /* Initialise defaults */
+   app->enable_mnemonics = DEFAULT_ENABLE_MNEMONICS;
+   app->enable_menu_accels = DEFAULT_ENABLE_MENU_BAR_ACCEL;
+@@ -1403,9 +1402,6 @@ terminal_app_init (TerminalApp *app)
+   gconf_client_add_dir (app->conf, CONF_GLOBAL_PREFIX,
+                         GCONF_CLIENT_PRELOAD_ONELEVEL,
+                         NULL);
+-  gconf_client_add_dir (app->conf, MONOSPACE_FONT_DIR,
+-                        GCONF_CLIENT_PRELOAD_ONELEVEL,
+-                        NULL);
+   gconf_client_add_dir (app->conf, CONF_PROXY_PREFIX,
+                         GCONF_CLIENT_PRELOAD_ONELEVEL,
+                         NULL);
+@@ -1430,12 +1426,6 @@ terminal_app_init (TerminalApp *app)
+                              terminal_app_encoding_list_notify_cb,
+                              app, NULL, NULL);
+ 
+-  app->system_font_notify_id =
+-    gconf_client_notify_add (app->conf,
+-                             MONOSPACE_FONT_KEY,
+-                             terminal_app_system_font_notify_cb,
+-                             app, NULL, NULL);
+-
+   app->enable_mnemonics_notify_id =
+     gconf_client_notify_add (app->conf,
+                              ENABLE_MNEMONICS_KEY,
+@@ -1452,7 +1442,6 @@ terminal_app_init (TerminalApp *app)
+   gconf_client_notify (app->conf, PROFILE_LIST_KEY);
+   gconf_client_notify (app->conf, DEFAULT_PROFILE_KEY);
+   gconf_client_notify (app->conf, ENCODING_LIST_KEY);
+-  gconf_client_notify (app->conf, MONOSPACE_FONT_KEY);
+   gconf_client_notify (app->conf, ENABLE_MENU_BAR_ACCEL_KEY);
+   gconf_client_notify (app->conf, ENABLE_MNEMONICS_KEY);
+ 
+@@ -1504,15 +1493,12 @@ terminal_app_finalize (GObject *object)
+     gconf_client_notify_remove (app->conf, app->default_profile_notify_id);
+   if (app->encoding_list_notify_id != 0)
+     gconf_client_notify_remove (app->conf, app->encoding_list_notify_id);
+-  if (app->system_font_notify_id != 0)
+-    gconf_client_notify_remove (app->conf, app->system_font_notify_id);
+   if (app->enable_menu_accels_notify_id != 0)
+     gconf_client_notify_remove (app->conf, app->enable_menu_accels_notify_id);
+   if (app->enable_mnemonics_notify_id != 0)
+     gconf_client_notify_remove (app->conf, app->enable_mnemonics_notify_id);
+ 
+   gconf_client_remove_dir (app->conf, CONF_GLOBAL_PREFIX, NULL);
+-  gconf_client_remove_dir (app->conf, MONOSPACE_FONT_DIR, NULL);
+ 
+   g_object_unref (app->conf);
+ 
+@@ -1524,6 +1510,8 @@ terminal_app_finalize (GObject *object)
+ 
+   pango_font_description_free (app->system_font_desc);
+ 
++  g_object_unref (app->desktop_interface_settings);
++
+   terminal_accels_shutdown ();
+ 
+   G_OBJECT_CLASS (terminal_app_parent_class)->finalize (object);
+-- 
+1.7.3.4
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild
index a14ed06e..8608dd7e 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild
@@ -21,13 +21,13 @@ else
 fi
 
 # libgnome needed for some monospace font schema, bug #274638
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.91.6:3
-	>=gnome-base/gconf-2.31.3
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	>=x11-libs/gtk+-2.99.3:3
 	>=x11-libs/vte-0.27.3:2.90
+	>=gnome-base/gconf-2.31.3
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	x11-libs/libSM
-	x11-libs/libX11
-	gnome-base/libgnome"
+	x11-libs/libICE"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
@@ -45,7 +45,8 @@ src_prepare() {
 	# Use login shell by default (#12900)
 	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
 
-	epatch "${FILESDIR}"/${PN}-2.33.4-fix-gdk-targets.patch
+	# Remove libgnome dep, taken from upstream, not needed for next release
+	epatch "${FILESDIR}"/${P}-remove-libgnome-dep.patch
 
 	[[ ${PV} != 9999 ]] && eautoreconf