Updated signals patch to work with old glib

5 files changed, 6 insertions, 48 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index bd3fa43b823c..c89fde1820ce 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.121 2004/01/19 22:26:47 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.122 2004/01/19 22:27:25 rizzo Exp $
 
   19 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r5.ebuild,
   files/gaim-0.76cvs-signals-varargs.diff, files/gaim-0.76cvs-varargs.diff:
-  Updated signals patch to work with old glib
+  Updated signals patch to work with old glib for bug 38725.  Thanks to Tristan Henderson.
 
   19 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r5.ebuild,
   files/gaim-0.76cvs-signals-varargs.diff:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 001e602d4a43..b94d887e3935 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -4,7 +4,7 @@ MD5 670e0f5acb82e1065d1055f6d407cdb9 gaim-0.75-r5.ebuild 3309
 MD5 78be5b331aa107c0ef01b5252eb8c87e gaim-0.72-r1.ebuild 2890
 MD5 cecb719b31af4ea5759fffa397de52be gaim-0.72.ebuild 2508
 MD5 9b0c0eb504517576c7d18406c8c52324 gaim-0.74-r2.ebuild 3858
-MD5 c6e7c1b047c4c1cb16ce925abc0a3e7f ChangeLog 20607
+MD5 c691fcda1ef499451954447e3eb6e601 ChangeLog 20652
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
diff --git a/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff b/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff
index b191c7412bbb..7e6a947b290f 100644
--- a/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff
+++ b/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff
@@ -20,7 +20,7 @@ diff -u -u -r1.13 -r1.14
  
 +		/* This is necessary because a va_list may only be
 +		 * evaluated once */
-+		va_copy(tmp, args);
++		G_VA_COPY(tmp, args);
 +
  		if (handler_data->use_vargs)
  		{
@@ -51,7 +51,7 @@ diff -u -u -r1.13 -r1.14
  
  		handler_data = (GaimSignalHandlerData *)l->data;
  
-+		va_copy(tmp,args);
++		G_VA_COPY(tmp,args);
 +
  		if (handler_data->use_vargs)
  		{
diff --git a/net-im/gaim/files/gaim-0.76cvs-varargs.diff b/net-im/gaim/files/gaim-0.76cvs-varargs.diff
deleted file mode 100644
index fcafd00bdfc8..000000000000
--- a/net-im/gaim/files/gaim-0.76cvs-varargs.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: src/signals.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/signals.c,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -u -r1.13 -r1.14
---- src/signals.c	10 Jan 2004 04:04:56 -0000	1.13
-+++ src/signals.c	13 Jan 2004 02:15:46 -0000	1.14
-@@ -415,6 +415,7 @@
- 	GaimSignalData *signal_data;
- 	GaimSignalHandlerData *handler_data;
- 	GList *l, *l_next;
-+	va_list tmp;
- 
- 	g_return_if_fail(instance != NULL);
- 	g_return_if_fail(signal   != NULL);
-@@ -440,16 +441,22 @@
- 
- 		handler_data = (GaimSignalHandlerData *)l->data;
- 
-+		/* This is necessary because a va_list may only be
-+		 * evaluated once */
-+		va_copy(tmp, args);
-+
- 		if (handler_data->use_vargs)
- 		{
--			((void (*)(va_list, void *))handler_data->cb)(args,
-+			((void (*)(va_list, void *))handler_data->cb)(tmp,
- 														  handler_data->data);
- 		}
- 		else
- 		{
--			signal_data->marshal(handler_data->cb, args,
-+			signal_data->marshal(handler_data->cb, tmp,
- 								 handler_data->data, NULL);
- 		}
-+
-+		va_end(tmp);
- 	}
- }
- 
diff --git a/net-im/gaim/gaim-0.75-r5.ebuild b/net-im/gaim/gaim-0.75-r5.ebuild
index 47c242f34ba8..f9e2176ac82b 100644
--- a/net-im/gaim/gaim-0.75-r5.ebuild
+++ b/net-im/gaim/gaim-0.75-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r5.ebuild,v 1.3 2004/01/19 14:36:25 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r5.ebuild,v 1.4 2004/01/19 22:26:47 rizzo Exp $
 
 inherit flag-o-matic
 
@@ -33,7 +33,6 @@ src_unpack() {
 	unpack ${P}.tar.bz2 || die
 	cd ${S}
 	epatch ${FILESDIR}/gaim-0.75-static-prpls.patch
-	#epatch ${FILESDIR}/gaim-0.76cvs-varargs.diff
 	epatch ${FILESDIR}/gaim-0.76cvs-signals-varargs.diff
 	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
 }