summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-05-05 04:30:35 +0000
committerDon Seiler <rizzo@gentoo.org>2004-05-05 04:30:35 +0000
commit85273389b544f6dab21100a4f2a629dcf606afd5 (patch)
treec95841a6d74fb9f44775b987091833bb054a90d7 /net-im
parentgcc-3.4.0 must depend on glibc-2.3.3_pre20040420 for mips (diff)
downloadhistorical-85273389b544f6dab21100a4f2a629dcf606afd5.tar.gz
historical-85273389b544f6dab21100a4f2a629dcf606afd5.tar.bz2
historical-85273389b544f6dab21100a4f2a629dcf606afd5.zip
Patch for msn chat closing crash. Fixes bug #47388
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog6
-rw-r--r--net-im/gaim/Manifest5
-rw-r--r--net-im/gaim/files/gaim-0.77-msn_chat_leave.patch13
-rw-r--r--net-im/gaim/gaim-0.77-r1.ebuild6
4 files changed, 25 insertions, 5 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 2a6ec9613403..44492972b6c7 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +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.173 2004/05/04 21:19:08 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.174 2004/05/05 04:30:34 rizzo Exp $
+
+ 04 May 2004; Don Seiler <rizzo@gentoo.org>;
+ +files/gaim-0.77-msn_chat_leave.patch, gaim-0.77-r1.ebuild:
+ Patch for msn chat closing crash. Fixes bug #47388
04 May 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.77-r1.ebuild,
gaim-0.77.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 2b4bf887afbb..bcb600a32135 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,7 +1,7 @@
-MD5 ff8a2db7f6d5f9c6a6402556464c07ef gaim-0.77-r1.ebuild 4302
+MD5 174f83e7e177e7dfbe5774757d89a404 gaim-0.77-r1.ebuild 4385
MD5 67f934f07b6ac2582af8dc2438876974 gaim-0.77.ebuild 4042
MD5 1b332d24ed4e517a3b587f840c551acc gaim-0.75-r10.ebuild 3678
-MD5 9d1914cc81e7a69d627cee4b4e8e0803 ChangeLog 28386
+MD5 38c616dc32e6015b91e7d42d4fdcf4d2 ChangeLog 28549
MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
MD5 76d3a02120c18747eb5c3335dc17b16d files/gaim-0.77-plugin-prefs.patch 3926
@@ -11,6 +11,7 @@ MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff
MD5 6590ac50c358f619973c6226219a5422 files/gaim-0.77-64bit_goodness.patch 4544
MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
MD5 a8234ce30b90015d2798a6f576982857 files/gaim-0.78cvs-novelltweaks5.patch 715
+MD5 d2266e07284f788c6a45da386e2a5c8f files/gaim-0.77-msn_chat_leave.patch 421
MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77-r1 63
MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
diff --git a/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch b/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch
new file mode 100644
index 000000000000..589b2213f32a
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch
@@ -0,0 +1,13 @@
+--- msn.c.orig 2004-05-04 23:06:06.983204743 -0500
++++ msn.c 2004-05-04 23:11:01.329968111 -0500
+@@ -1052,8 +1052,8 @@ msn_chat_leave(GaimConnection *gc, int i
+
+ strcpy(buf, "OUT\r\n");
+
+- if (!msn_servconn_write(swboard->servconn, buf, strlen(buf)))
+- msn_switchboard_destroy(swboard);
++ msn_servconn_write(swboard->servconn, buf, strlen(buf));
++ msn_switchboard_destroy(swboard);
+
+ serv_got_chat_left(gc, id);
+ }
diff --git a/net-im/gaim/gaim-0.77-r1.ebuild b/net-im/gaim/gaim-0.77-r1.ebuild
index c0c87e275012..f3da2f3607fd 100644
--- a/net-im/gaim/gaim-0.77-r1.ebuild
+++ b/net-im/gaim/gaim-0.77-r1.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.77-r1.ebuild,v 1.2 2004/05/04 21:19:08 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.77-r1.ebuild,v 1.3 2004/05/05 04:30:34 rizzo Exp $
inherit flag-o-matic eutils gcc
use debug && inherit debug
@@ -61,8 +61,10 @@ src_unpack() {
epatch ${FILESDIR}/gaim-0.77-smileys_dialogs.patch
epatch ${FILESDIR}/gaim-0.77-ucs2-copypaste.patch
use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
- cd src/protocols/novell
+ cd ${S}/src/protocols/novell
epatch ${FILESDIR}/gaim-0.78cvs-novelltweaks5.patch
+ cd ${S}/src/protocols/msn
+ epatch ${FILESDIR}/gaim-0.77-msn_chat_leave.patch
}
src_compile() {