diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2003-08-05 21:18:05 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2003-08-05 21:18:05 +0000 |
| commit | c11a09adf4c31ef3295c8181b99073cd3403fa63 (patch) | |
| tree | 5b109ad1f6e45df7ba21d2b82405c2bc79c94e2d /net-im | |
| parent | Updating for 2.6 compliance (diff) | |
| download | historical-c11a09adf4c31ef3295c8181b99073cd3403fa63.tar.gz historical-c11a09adf4c31ef3295c8181b99073cd3403fa63.tar.bz2 historical-c11a09adf4c31ef3295c8181b99073cd3403fa63.zip | |
Adding patch to fix prefs importing from older versions, bug is upstream.
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gaim/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/gaim/Manifest | 5 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-0.66-prefs.c.diff | 18 | ||||
| -rw-r--r-- | net-im/gaim/gaim-0.66-r3.ebuild | 3 |
4 files changed, 29 insertions, 4 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index 52171855abec..4c61505c9754 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/gaim # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.67 2003/08/04 11:54:30 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.68 2003/08/05 21:17:48 rizzo Exp $ + + 05 Aug 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.66-r3.ebuild, + files/gaim-0.66-prefs.c.diff: + Adding patch to fix prefs importing from older versions, bug is upstream. + Thanks to Eric Hustvedt for the patch. *gaim-0.66-r3 (03 Aug 2003) diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 8d70be7331fe..ecfda606db44 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -1,13 +1,14 @@ MD5 63f5d5add45a34870e61e2e39d70b919 gaim-0.63-r1.ebuild 1835 MD5 563bfa3942598d75f097aaf618e9bfe3 gaim-0.66.ebuild 2163 MD5 c312c7f2f86088e2cbae1c306fb009ee gaim-0.59.9-r1.ebuild 2173 -MD5 03ddde8eee5a72dd8655868c50532004 gaim-0.66-r3.ebuild 1951 +MD5 a7d996e60f8521e458599e249267645f gaim-0.66-r3.ebuild 1994 MD5 75b5b8d5565abeeca9fdad904cc765d6 gaim-0.65-r1.ebuild 2167 -MD5 ee0a43af83ed64a9c458bc90a4fa7c02 ChangeLog 11453 +MD5 9734ac3e1e7f0ffeb2840accf19ef1a8 ChangeLog 11670 MD5 769049deda9ae8a4f818bc6b74a5baff metadata.xml 506 MD5 00c380b0a716b59b0c7e2c6eca2d3510 gaim-0.66-r2.ebuild 1951 MD5 07beb4e67f5dd8cafed146e45b919144 files/digest-gaim-0.59.9-r1 128 MD5 ee8fb28717ed5fd8bdfce0b4c0611d75 files/digest-gaim-0.66 126 +MD5 eaec78ac2e19b5e10a20a2c86bf65a34 files/gaim-0.66-prefs.c.diff 598 MD5 908f7feabba8c8b1d74510f1f2b7706d files/digest-gaim-0.63-r1 126 MD5 a2bf73fbf71ac31dc9de320d2f7c2649 files/digest-gaim-0.65-r1 126 MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r2 126 diff --git a/net-im/gaim/files/gaim-0.66-prefs.c.diff b/net-im/gaim/files/gaim-0.66-prefs.c.diff new file mode 100644 index 000000000000..4e02a02ffef0 --- /dev/null +++ b/net-im/gaim/files/gaim-0.66-prefs.c.diff @@ -0,0 +1,18 @@ +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/prefs.c,v +retrieving revision 1.410 +retrieving revision 1.411 +diff -u -r1.410 -r1.411 +--- gaim/gaim/src/prefs.c 2003/07/18 14:34:08 1.410 ++++ gaim/gaim/src/prefs.c 2003/07/24 05:32:53 1.411 +@@ -441,7 +441,9 @@ + return; + } + +- if(strcmp(pref->value.string, value)) { ++ if((value && !pref->value.string) || ++ (!value && pref->value.string) || ++ strcmp(pref->value.string, value)) { + g_free(pref->value.string); + pref->value.string = g_strdup(value); + do_callbacks(name, pref); diff --git a/net-im/gaim/gaim-0.66-r3.ebuild b/net-im/gaim/gaim-0.66-r3.ebuild index b6945900227c..92db2fec0f8c 100644 --- a/net-im/gaim/gaim-0.66-r3.ebuild +++ b/net-im/gaim/gaim-0.66-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r3.ebuild,v 1.1 2003/08/04 00:59:35 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r3.ebuild,v 1.2 2003/08/05 21:17:48 rizzo Exp $ IUSE="nls perl spell nas ssl cjk" @@ -28,6 +28,7 @@ DEPEND="=sys-libs/db-1* src_unpack() { unpack ${P}.tar.bz2 cd ${P} + epatch ${FILESDIR}/gaim-0.66-prefs.c.diff use ssl && { cd ${S}/plugins unpack encrypt-${EV}.tar.gz |