swap'd out dbus patch bug #148128

(Portage version: 2.1.2_pre2-r9)

4 files changed, 82 insertions, 9 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index a7bf66c20d7a..bd63151f2919 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.414 2006/10/15 00:29:14 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.415 2006/10/16 23:34:32 gothgirl Exp $
+
+  16 Oct 2006; gothgirl <gothgirl@gentoo.org>
+  +files/gaim-2.0.0_beta3-dbus-1.patch, gaim-2.0.0_beta3-r4.ebuild:
+  swap'd out dbus patch, thanks to David Li bug#148128
 
   14 Oct 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta3-r4.ebuild:
   adjusted pdepend for correct version
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4 b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
index d3d1046a0c2e..f020f448cc44 100644
--- a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
@@ -1,6 +1,3 @@
-MD5 78ef09a607941f44821e9294a653eff3 gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515
-RMD160 f58826b3ee190a68e806d4bc141d9715693df9ad gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515
-SHA256 e23c7c1a6a06cf6b3dd13da58905030addb6f1f7f4e4c1a70e19ef159f0b417f gaim-2.0.0_beta3-dbus.patch.tar.bz2 164515
 MD5 202b9e6ee5171da90de14230b3037dc1 gaim-2.0.0beta3.1.tar.bz2 5445059
 RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 gaim-2.0.0beta3.1.tar.bz2 5445059
 SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4 gaim-2.0.0beta3.1.tar.bz2 5445059
diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch b/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch
new file mode 100644
index 000000000000..c372eaebfcf2
--- /dev/null
+++ b/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch
@@ -0,0 +1,73 @@
+diff -Nur gaim-2.0.0+beta3/configure.ac gaim-2.0.0+beta3.new/configure.ac
+--- gaim-2.0.0+beta3/configure.ac	2006-08-18 16:10:38.000000000 +0200
++++ gaim-2.0.0+beta3.new/configure.ac	2006-08-18 16:10:39.000000000 +0200
+@@ -587,7 +587,7 @@
+ AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([
+ *** GLib 2.0 is required to build Gaim; please make sure you have the GLib
+ *** development headers installed. The latest version of GLib is
+-*** always available at http://www.gtk.org/.]))
++*** always available at http://www.gtk.org/.]),gthread)
+ AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([
+ *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+
+ *** development headers installed. The latest version of GTK+ is
+diff -Nur gaim-2.0.0+beta3/src/dbus-server.c gaim-2.0.0+beta3.new/src/dbus-server.c
+--- gaim-2.0.0+beta3/src/dbus-server.c	2006-02-11 06:25:47.000000000 +0100
++++ gaim-2.0.0+beta3.new/src/dbus-server.c	2006-08-18 16:10:39.000000000 +0200
+@@ -710,6 +710,8 @@
+ 
+ gboolean gaim_dbus_init(void) 
+ {
++	if (g_thread_supported())
++		dbus_g_thread_init();
+     gaim_dbus_init_ids();
+     return gaim_dbus_dispatch_init() ;
+ }
+diff -Nur gaim-2.0.0+beta3/src/gtkmain.c gaim-2.0.0+beta3.new/src/gtkmain.c
+--- gaim-2.0.0+beta3/src/gtkmain.c	2006-03-07 05:45:22.000000000 +0100
++++ gaim-2.0.0+beta3.new/src/gtkmain.c	2006-08-18 16:10:39.000000000 +0200
+@@ -65,6 +65,7 @@
+ #include "gtkstock.h"
+ #include "gtkwhiteboard.h"
+ 
++#include <glib/gthread.h>
+ #ifdef HAVE_SIGNAL_H
+ # include <signal.h>
+ #endif
+@@ -643,6 +644,15 @@
+ 	gtk_rc_add_default_file(search_path);
+ 	g_free(search_path);
+ 
++#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE))
++	/* Since threads can be yanked in all unawares by other libraries,
++	 * and some libraries aren't smart enough to initialize the thread
++	 * subsystem when they need it, we need to do this here.  We also
++	 * threadify dbus when that gets initialized.  Ugh. */
++	if (!g_thread_supported())
++		g_thread_init(NULL);
++	gdk_threads_init();
++#endif /* Glib has threads */
+ 
+ 	gui_check = gtk_init_check(&argc, &argv);
+ 	if (!gui_check) {
+diff -Nur gaim-2.0.0+beta3/src/Makefile.am gaim-2.0.0+beta3.new/src/Makefile.am
+--- gaim-2.0.0+beta3/src/Makefile.am	2006-03-25 16:45:49.000000000 +0100
++++ gaim-2.0.0+beta3.new/src/Makefile.am	2006-08-18 16:10:39.000000000 +0200
+@@ -334,6 +334,7 @@
+ gaim_LDFLAGS = -export-dynamic
+ gaim_LDADD = \
+ 	@LIBOBJS@ \
++	$(GLIB_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(DBUS_LIBS) \
+ 	$(SOUND_LIBS) \
+diff -Nur gaim-2.0.0+beta3/src/Makefile.in gaim-2.0.0+beta3.new/src/Makefile.in
+--- gaim-2.0.0+beta3/src/Makefile.in	2006-03-29 00:39:14.000000000 +0200
++++ gaim-2.0.0+beta3.new/src/Makefile.in	2006-08-18 16:11:20.000000000 +0200
+@@ -772,6 +772,7 @@
+ gaim_LDFLAGS = -export-dynamic
+ gaim_LDADD = \
+ 	@LIBOBJS@ \
++	$(GLIB_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(DBUS_LIBS) \
+ 	$(SOUND_LIBS) \
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
index 2e4acf707622..73998ef83f09 100644
--- a/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild,v 1.3 2006/10/15 00:29:14 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild,v 1.4 2006/10/16 23:34:32 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app
 
@@ -10,8 +10,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2
-	 mirror://gentoo/${P}-dbus.patch.tar.bz2"
+SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -54,7 +53,7 @@ DEPEND="$RDEPEND
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta4 )"
+PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -143,7 +142,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/"${P}"-as-needed.patch
 	epatch "${FILESDIR}"/"${P}"-avahi-compat.patch
-	epatch "${DISTDIR}"/"${P}"-dbus.patch.tar.bz2
+	epatch "${FILESDIR}"/"${P}"-dbus-1.patch
 	eautoreconf || die "Failed running eautoreconf"
 }