From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PnGQP-0008Ry-O4 for garchives@archives.gentoo.org; Wed, 09 Feb 2011 20:14:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4438BE0909; Wed, 9 Feb 2011 20:13:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DF6EEE0909 for ; Wed, 9 Feb 2011 20:13:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4876C1B40DD for ; Wed, 9 Feb 2011 20:13:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7991480073 for ; Wed, 9 Feb 2011 20:13:22 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <79079dd55a0ea2340ec29d0397c76c89a5a8be55.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnome-dep.patch x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild X-VCS-Directories: x11-terms/gnome-terminal/files/ x11-terms/gnome-terminal/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 79079dd55a0ea2340ec29d0397c76c89a5a8be55 Date: Wed, 9 Feb 2011 20:13:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1c9d350d92da9fa53b0013dfd50c6469 commit: 79079dd55a0ea2340ec29d0397c76c89a5a8be55 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Feb 9 12:10:57 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Feb 9 12:10:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D79079dd5 x11-terms/gnome-terminal: 2.33.4 -> 2.33.5 * Add patch from upstream to remove libgnome dependency --- .../gnome-terminal-2.33.4-fix-gdk-targets.patch | 62 ------- ...gnome-terminal-2.33.5-remove-libgnome-dep.patch | 173 ++++++++++++++= ++++++ ...-2.33.4.ebuild =3D> gnome-terminal-2.33.5.ebuild} | 13 +- 3 files changed, 180 insertions(+), 68 deletions(-) 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 2c9932c..0000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-target= s.patch +++ /dev/null @@ -1,62 +0,0 @@ -Gdk-3.0/Gtk-3.0 supports multiple targets now, and the "target" variable= =20 -no longer works. So, sort of hack around it for now? - ---- ---- configure.ac -+++ configure.ac -@@ -53,25 +53,28 @@ - [with_gtk=3D2.0]) - AC_MSG_RESULT([$with_gtk]) -=20 -+GDK_TARGETS=3D - case "$with_gtk" in - 2.0) GTK_API_VERSION=3D2.0 - GTK_REQUIRED=3D2.18.0 - VTE_PC_VERSION=3D - VTE_REQUIRED=3D0.26.0 -+ GDK_TARGETS=3D$($PKG_CONFIG --variable target gdk-$GTK_API_VERSI= ON) - ;; - 3.0) GTK_API_VERSION=3D3.0 - GTK_REQUIRED=3D2.91.6 - VTE_PC_VERSION=3D-2.90 - VTE_REQUIRED=3D0.27.3 -+ GDK_TARGETS=3D$($PKG_CONFIG --variable targets gdk-$GTK_API_VERS= ION) - ;; - esac -=20 --GDK_TARGET=3D"$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" -- --case "$GDK_TARGET" in -- x11) PLATFORM_DEPS=3D"x11" ;; -- *) PLATFORM_DEPS=3D"" ;; --esac -+PLATFORM_DEPS=3D -+for i in $GDK_TARGETS; do -+ if test "$i" =3D "x11"; then -+ PLATFORM_DEPS=3D"x11" -+ fi -+done -=20 - PKG_CHECK_MODULES([TERM], - [vte$VTE_PC_VERSION >=3D $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=3Dxsmp SMCLIENT_PKGS=3D"sm" ;; -- win32|quartz) with_smclient=3D$GDK_TARGET ;; -- *) with_smclient=3Dno ;; -- esac]) -+ [for i in $GDK_TARGETS; do -+ if test "$i" =3D "x11"; then -+ with_smclient=3Dxsmp SMCLIENT_PKGS=3D"sm" -+ elif test "$i" =3D "win32" -o "$i" =3D "quartz"; then -+ with_smclient=3D$i -+ else -+ with_smclient=3Dno -+ fi -+ done]) - AC_MSG_RESULT([$with_smclient]) -=20 - if test "$with_smclient" !=3D "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 0000000..fd69eae --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.5-remove-libgnom= e-dep.patch @@ -0,0 +1,173 @@ +From e1ba3eea28f62c7b9b16a35b2d625aaf925f4802 Mon Sep 17 00:00:00 2001 +From: Christian Persch +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=3D2.26.0 + GIO_REQUIRED=3D2.26.0 + GCONF_REQUIRED=3D2.31.3 ++GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=3D0.1.0 +=20 + AC_MSG_CHECKING([which gtk+ version to compile against]) + AC_ARG_WITH([gtk], +@@ -90,6 +91,7 @@ PKG_CHECK_MODULES([TERM], + gio-2.0 >=3D $GIO_REQUIRED + gtk+-$GTK_API_VERSION >=3D $GTK_REQUIRED + gconf-2.0 >=3D $GCONF_REQUIRED ++ gsettings-desktop-schemas >=3D $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + $PLATFORM_DEPS]) +=20 + # ******** +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 +=20 + #define FALLBACK_PROFILE_ID "Default" ++#define DESKTOP_INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.inte= rface" ++#define MONOSPACE_FONT_KEY_NAME "monospace-font-name" +=20 + /* 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; +=20 ++ GSettings *desktop_interface_settings; ++ + GHashTable *profiles; + char* default_profile_id; + TerminalProfile *default_profile; +@@ -150,8 +153,6 @@ static TerminalApp *global_app =3D NULL; + /* Evil hack alert: this is exported from libgconf-2 but not in a publi= c header */ + extern gboolean gconf_spawn_daemon(GError** err); +=20 +-#define MONOSPACE_FONT_DIR "/desktop/gnome/interface" +-#define MONOSPACE_FONT_KEY MONOSPACE_FONT_DIR "/monospace_font_name" + #define DEFAULT_MONOSPACE_FONT ("Monospace 10") +=20 + #define ENABLE_MNEMONICS_KEY CONF_GLOBAL_PREFIX "/use_mnemonics" +@@ -963,26 +964,14 @@ terminal_app_encoding_list_notify_cb (GConfClient = *client, + } +=20 + 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 =3D TERMINAL_APP (user_data); +- GConfValue *gconf_value; + const char *font =3D NULL; + PangoFontDescription *font_desc; +=20 +- if (strcmp (gconf_entry_get_key (entry), MONOSPACE_FONT_KEY) !=3D 0) +- return; +- +- gconf_value =3D gconf_entry_get_value (entry); +- if (gconf_value && +- gconf_value->type =3D=3D GCONF_VALUE_STRING) +- font =3D gconf_value_get_string (gconf_value); +- if (!font) +- font =3D DEFAULT_MONOSPACE_FONT; +- g_assert (font !=3D NULL); ++ g_settings_get (settings, MONOSPACE_FONT_KEY_NAME, "&s", &font); +=20 + font_desc =3D pango_font_description_from_string (font); + if (app->system_font_desc && +@@ -1390,6 +1379,16 @@ terminal_app_init (TerminalApp *app) +=20 + gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME); +=20 ++ /* Terminal global settings */ ++ app->desktop_interface_settings =3D 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 =3D DEFAULT_ENABLE_MNEMONICS; + app->enable_menu_accels =3D 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); +=20 +- app->system_font_notify_id =3D +- gconf_client_notify_add (app->conf, +- MONOSPACE_FONT_KEY, +- terminal_app_system_font_notify_cb, +- app, NULL, NULL); +- + app->enable_mnemonics_notify_id =3D + 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); +=20 +@@ -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 !=3D 0) + gconf_client_notify_remove (app->conf, app->encoding_list_notify_id= ); +- if (app->system_font_notify_id !=3D 0) +- gconf_client_notify_remove (app->conf, app->system_font_notify_id); + if (app->enable_menu_accels_notify_id !=3D 0) + gconf_client_notify_remove (app->conf, app->enable_menu_accels_noti= fy_id); + if (app->enable_mnemonics_notify_id !=3D 0) + gconf_client_notify_remove (app->conf, app->enable_mnemonics_notify= _id); +=20 + gconf_client_remove_dir (app->conf, CONF_GLOBAL_PREFIX, NULL); +- gconf_client_remove_dir (app->conf, MONOSPACE_FONT_DIR, NULL); +=20 + g_object_unref (app->conf); +=20 +@@ -1524,6 +1510,8 @@ terminal_app_finalize (GObject *object) +=20 + pango_font_description_free (app->system_font_desc); +=20 ++ g_object_unref (app->desktop_interface_settings); ++ + terminal_accels_shutdown (); +=20 + G_OBJECT_CLASS (terminal_app_parent_class)->finalize (object); +--=20 +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 similarity index 82% rename from x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild rename to x11-terms/gnome-terminal/gnome-terminal-2.33.5.ebuild index a14ed06..8608dd7 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 =20 # libgnome needed for some monospace font schema, bug #274638 -RDEPEND=3D">=3Ddev-libs/glib-2.25.12:2 - >=3Dx11-libs/gtk+-2.91.6:3 - >=3Dgnome-base/gconf-2.31.3 +RDEPEND=3D">=3Ddev-libs/glib-2.26.0:2 + >=3Dx11-libs/gtk+-2.99.3:3 >=3Dx11-libs/vte-0.27.3:2.90 + >=3Dgnome-base/gconf-2.31.3 + >=3Dgnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM - x11-libs/libX11 - gnome-base/libgnome" + x11-libs/libICE" DEPEND=3D"${RDEPEND} >=3Ddev-util/intltool-0.40 >=3Ddev-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 =20 - 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 =20 [[ ${PV} !=3D 9999 ]] && eautoreconf =20