summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorminskim <minskim>2004-08-04 21:36:52 +0000
committerminskim <minskim>2004-08-04 21:36:52 +0000
commit124b66c02d598b4b8c1501728b211bfd738098bf (patch)
tree7d46b202b2173939826516e676e1b346b841b4e9 /chat
parenta198363204b5bf5b08d917ae530cfca0c73a41b3 (diff)
downloadpkgsrc-124b66c02d598b4b8c1501728b211bfd738098bf.tar.gz
- Remove the Socks-5 patch because the current version is not vulnerable
any more. Should have been done when xchat was updated to 2.0.9. - Fix xchat bug 986958. Patch obtained from xchat CVS HEAD. Bump PKGREVISION.
Diffstat (limited to 'chat')
-rw-r--r--chat/xchat2/Makefile3
-rw-r--r--chat/xchat2/distinfo4
-rw-r--r--chat/xchat2/patches/patch-aa29
3 files changed, 22 insertions, 14 deletions
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 8aa8e2de652..9ebafb55eca 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/07/18 14:47:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.33 2004/08/04 21:36:52 minskim Exp $
#
DISTNAME= xchat-2.0.10
+PKGREVISION= 1
CATEGORIES= chat gnome
MASTER_SITES= http://www.xchat.org/files/source/2.0/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/xchat2/distinfo b/chat/xchat2/distinfo
index c547eed3d1a..92e0b444393 100644
--- a/chat/xchat2/distinfo
+++ b/chat/xchat2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2004/07/02 08:04:18 minskim Exp $
+$NetBSD: distinfo,v 1.13 2004/08/04 21:36:52 minskim Exp $
SHA1 (xchat-2.0.10.tar.bz2) = bc5d45589a1c9a4b59edcb12699fd33344243c22
Size (xchat-2.0.10.tar.bz2) = 1113265 bytes
-SHA1 (patch-aa) = 19abf05787106a93adcfc678bf25ad5d8543ba78
+SHA1 (patch-aa) = c7da24eb1c4fa571a431bab581539df6e9cf2b14
diff --git a/chat/xchat2/patches/patch-aa b/chat/xchat2/patches/patch-aa
index f32ee615db2..11fafd51cee 100644
--- a/chat/xchat2/patches/patch-aa
+++ b/chat/xchat2/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2004/07/02 08:04:18 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2004/08/04 21:36:52 minskim Exp $$)C
---- src/common/util.c.orig 2004-06-18 23:26:29.000000000 -0500
-+++ src/common/util.c
-@@ -631,7 +631,7 @@ get_cpu_str (void)
- } else
- #endif
- snprintf (buf, 128,
-- (cpus == 1) ? "%s %s [%s]" : "%s %s [%s/SMP]",
-+ "%s %s [%s]",
- un.sysname, un.release, un.machine);
+--- src/fe-gtk/fkeys.c.orig 2004-07-01 11:28:43.000000000 -0500
++++ src/fe-gtk/fkeys.c
+@@ -1368,9 +1368,14 @@ key_action_tab_comp (GtkWidget *t, GdkEv
+ prefix_len, skip_len = 0, is_nick, is_cmd = 0;
+ char buf[COMP_BUF], ent[CHANLEN], *postfix = NULL, *result, *ch;
+ GList *list = NULL, *tmp_list = NULL;
+- const char *text = gtk_entry_get_text (GTK_ENTRY (t));
++ const char *text;
+ GCompletion *gcomp = NULL;
+
++ /* force the IM Context to reset */
++ gtk_editable_set_editable (GTK_EDITABLE (t), FALSE);
++ gtk_editable_set_editable (GTK_EDITABLE (t), TRUE);
++
++ text = GTK_ENTRY (t)->text;
+ if (text[0] == 0)
+ return 1;
- return buf;