Partial Fix for bug 268846 -- gnome-terminal errors out when no dbus-daemon is running. Upstream not interested in a complete fix.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 92 insertions, 14 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 64fc19d439ca..125efef50c4a 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.200 2009/09/06 12:57:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.201 2009/09/11 15:52:36 nirbheek Exp $
+
+*gnome-terminal-2.26.3.1-r2 (11 Sep 2009)
+
+  11 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-terminal-2.26.3.1-r1.ebuild, +gnome-terminal-2.26.3.1-r2.ebuild,
+  +files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch:
+  Partial Fix for bug 268846 -- gnome-terminal errors out when no
+  dbus-daemon is running. Upstream not interested in a complete fix.
 
   06 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-terminal-2.26.1.ebuild, gnome-terminal-2.26.2.ebuild,
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 1ad4540f4c9c..c51a16071d52 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-terminal-2.13.90-TERM-gnome.patch 413 RMD160 d2dd09acd8ac4b185316a09727cc5e3ebee100c3 SHA1 b83a85153e2c29fd287f97e873d1a851e57aac9a SHA256 812ffb7e6966b6ba813223af276c95d3a6efddceddc24b5637b085d4695dcd62
 AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
 AUX gnome-terminal-2.24.2-restore-switch-to-tab.patch 15041 RMD160 5860f46b1379dd40cd8ca9c9e23b30be5ef3e7cb SHA1 3ab937c566c401ad1ee82313cc6989338209fc47 SHA256 7edf095b8e037bcb2d41807eb3d26a6d4c9413088e1c9b58e4ef5eebf4c3a36e
 AUX gnome-terminal-2.26.3.1-cwd-on-new-tab.patch 7074 RMD160 36deb7b2808fe5db59fa3f3ae75c141d02d8c511 SHA1 64ac74d3eecff49416f93f02dc957b7fc00a91ce SHA256 7603ff478f8882816cc26f401f5dceca160bdab99878aa615eee34259efb93dd
+AUX gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch 2667 RMD160 b1f3ce54c8a90a54d1c2e5f1f87195c8d3c7f8fa SHA1 6c0b4d0a35c04b88b7219cd09f246fd489ec4808 SHA256 6b3fd92d3dced996fe09718873b007335fac14171fb667e7c04c9dc883d121a7
 DIST gnome-terminal-2.24.2-restore-switch-to-tab-i18n.patch.bz2 30429 RMD160 ebed0cc9f9519586495a1bb44fd7dd6b9a0c76a3 SHA1 72ce23ede1e27661aab0762ab2e77fa69dfcbcbc SHA256 106a5eb8de80ebc4a398e4b5964e1de2df33263b92f0cdc579fde2a078af4972
 DIST gnome-terminal-2.24.2.tar.bz2 1854226 RMD160 c496f736b012b3324e8168a7fa5356ca6223ef8d SHA1 f6900ee932fd7c3b86a11a598a0a7381fd2fd839 SHA256 849597d79f2dd6eb8d4079bc0b59c0f806a691ac2af360099ef0fa1f6b91e82a
 DIST gnome-terminal-2.26.2.tar.bz2 2180133 RMD160 d6166db97d2a3656f3797babc52623badf396d41 SHA1 b5a59076dac54845e26296d42951591b23c1ee2d SHA256 f937939eca0082dc7f3f9ddab72d612433ad948aac7e158ed75f5d7053e8d0e0
 DIST gnome-terminal-2.26.3.1.tar.bz2 2176049 RMD160 db6b5ba601c3c74e3424e88119501b9414e1f37d SHA1 68dc9739b4d35c0647596b1773c5da76782f1164 SHA256 40d97f983363002d6da574b35f3e4d44d4e8db38b776b226626f1e83d6fde1dc
 EBUILD gnome-terminal-2.24.2-r1.ebuild 1529 RMD160 a701aadb6231473755a459db718d86b8461517f4 SHA1 3c41b5fecc2613850df472b9c02e320a91eb62d6 SHA256 b81a70961138843343de63befe908af7db952d11b69a7e0caf744800e5687806
 EBUILD gnome-terminal-2.26.2.ebuild 1298 RMD160 64c5f695f3c43b112c4f5a073722f262a01b071e SHA1 5cb1eb0a2b03dc9575c70b91ce034a178148f790 SHA256 49d8477fb831e3a3fe0752d9a1e14569e205854d749c1bb9282a47e8ea976485
-EBUILD gnome-terminal-2.26.3.1-r1.ebuild 1486 RMD160 72186886ccf4cb868a74ba948c87c61d6885bdb9 SHA1 41550e4f93a8aeef8d341ace2a126632cd471cb7 SHA256 4f9ccae2a854338a60c93e53a1e54e02395080f1d1336e7e27720bd98ec89c1c
-MISC ChangeLog 27634 RMD160 9fe270e8cb434d1755f7b75496c14d7fb5ba6ee8 SHA1 d914c9a5b3f7415cba14646e5ecb0b64b9e58aa0 SHA256 9065ab64d820e430cfb30e9be015b0b5440ad915d7c5d0c26c70baca522ab0f6
+EBUILD gnome-terminal-2.26.3.1-r2.ebuild 1689 RMD160 78efef1581ccda3af71e5671d02196d05ae34798 SHA1 54093912ff93eaa31987008cdea64978dfada7e0 SHA256 68ea63c4186e783ff44721c638ef4b5f4c40086a87dc04d5b41c49d2362dc2d4
+MISC ChangeLog 28009 RMD160 86535878d3de9e335eeb680a2c1b0bffc2aa059c SHA1 03fb28ec0e126753ea421ac85cba9547ba13f8a2 SHA256 aff39fbf9fca0e3a4eb39d3e91d50244fc33883ca657c30df4b817091735a4ed
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqjscwACgkQ1fmVwcYIWAZ5NwCg3s+3E9VFvHOFro+2Ur0iy2Kw
-5owAoMJPNq7FcVPE2i+A7IPlxu14RrId
-=rzMj
------END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch
new file mode 100644
index 000000000000..b6945651eb5f
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch
@@ -0,0 +1,75 @@
+Partial fix for Gentoo bug 268846, upstream is not interested in a complete fix
+that allows gnome-terminal to work when gconf-daemon cannot be run.
+
+--
+From f41c3d14bdfd533109d7d75bdbb2e2a0ab59b60c Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Thu, 13 Aug 2009 12:31:11 +0000
+Subject: Be more lenient in the gconf daemon check
+
+Using gconf_ping_daemon() wasn't working right, since it returns FALSE
+not only when the gconf daemon cannot be spawned, but also if the daemon
+simply isn't running yet, but could be started without problems. Use
+gconf_spawn_daemon() instead. Should fix problem reported in bug 564649
+comment 5.
+---
+diff --git a/src/terminal.c b/src/terminal.c
+index 41285e5..fc0cb2b 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -236,8 +236,8 @@ get_factory_name_for_display (const char *display_name)
+ }
+ 
+ /* Evil hack alert: this is exported from libgconf-2 but not in a public header */
+-extern gboolean gconf_ping_daemon (void);
+-         
++extern gboolean gconf_spawn_daemon(GError** err);
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -329,7 +329,7 @@ main (int argc, char **argv)
+     {
+       g_printerr ("Failed to get the session bus: %s\nFalling back to non-factory mode.\n",
+                   error->message);
+-      g_error_free (error);
++      g_clear_error (&error);
+       goto factory_disabled;
+     }
+ 
+@@ -353,7 +353,7 @@ main (int argc, char **argv)
+                                           &error))
+     {
+       g_printerr ("Failed name request: %s\n", error->message);
+-      g_error_free (error);
++      g_clear_error (&error);
+       goto factory_disabled;
+     }
+ 
+@@ -419,7 +419,7 @@ main (int argc, char **argv)
+             {
+               /* Incompatible factory version, fall back, to new instance */
+               g_printerr (_("Incompatible factory version; creating a new instance.\n"));
+-              g_error_free (error);
++              g_clear_error (&error);
+ 
+               goto factory_disabled;
+             }
+@@ -449,10 +449,13 @@ factory_disabled:
+   /* If the gconf daemon isn't available (e.g. because there's no dbus
+    * session bus running), we'd crash later on. Tell the user about it
+    * now, and exit. See bug #561663.
++   * Don't use gconf_ping_daemon() here since the server may just not
++   * be running yet, but able to be started. See comments on bug #564649.
+    */
+-  if (!gconf_ping_daemon ())
++  if (!gconf_spawn_daemon (&error))
+     {
+-      g_printerr ("Failed to contact the GConf daemon; exiting.\n");
++      g_printerr ("Failed to summon the GConf demon: %s\n", error->message);
++      g_error_free (error);
+       exit (1);
+     }
+ 
+--
+cgit v0.8.2
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild
index b94693732563..95cca0c6a298 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r1.ebuild,v 1.2 2009/09/06 12:57:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.1 2009/09/11 15:52:36 nirbheek Exp $
 
 inherit eutils gnome2
 
@@ -45,6 +45,10 @@ src_unpack() {
 	# in user on /, fix bug #269318, import from upstream bug #565328.
 	epatch "${FILESDIR}"/${P}-cwd-on-new-tab.patch
 
+	# Fix bug 268846 -- gnome-terminal errors out if it can't find the gconf
+	# daemon. Patch is from upstream git repository, included in 2.28
+	epatch "${FILESDIR}"/${P}-partial-fix-dbus-error.patch
+
 	# patch gnome terminal to report as GNOME rather than xterm
 	# This needs to resolve a few bugs (#120294,)
 	# Leave out for now; causing too many problems