summaryrefslogtreecommitdiff
path: root/chat/gaim
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-05-06 13:44:00 +0000
committerjmmv <jmmv>2004-05-06 13:44:00 +0000
commit9631b4e26149e8b25e80b113b91ed8292d894a4f (patch)
tree98e2f734a0dcc706e0aa73e53b36fcc56f6ed4c0 /chat/gaim
parentf81f277ffde976aaef825365590af5501f73c41f (diff)
downloadpkgsrc-9631b4e26149e8b25e80b113b91ed8292d894a4f.tar.gz
Apply a patch (coming from CVS) to fix pasting of text in gaim when it was
copied from Mozilla. From Matthew Luckie (maintainer). Bump revision to 1.
Diffstat (limited to 'chat/gaim')
-rw-r--r--chat/gaim/Makefile3
-rw-r--r--chat/gaim/distinfo4
-rw-r--r--chat/gaim/patches/patch-aa30
3 files changed, 33 insertions, 4 deletions
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 2032de7d6b4..57d71da8ed0 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2004/04/24 09:29:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.60 2004/05/06 13:44:00 jmmv Exp $
#
DISTNAME= gaim-0.77
+PKGREVISION= 1
CATEGORIES= chat x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index aee61f67f28..3d430ec9b4b 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2004/04/24 09:29:53 jmmv Exp $
+$NetBSD: distinfo,v 1.41 2004/05/06 13:44:00 jmmv Exp $
SHA1 (gaim-0.77.tar.bz2) = 56101f1e5da73ad09992f2584fe2cdcff3c47e31
Size (gaim-0.77.tar.bz2) = 3709914 bytes
-SHA1 (patch-aa) = 4ddae874deff49b2c9fe38643d377dc34eb2b070
+SHA1 (patch-aa) = a32aeaeea27de7cada8db9a8d042c5e7ede60079
SHA1 (patch-ab) = 669fe9d5e4e35c0a06adf50491e2a54338c060c4
SHA1 (patch-ac) = aa5e1ae725bba363f7b924d0c61275b0a6dfa7e2
SHA1 (patch-ad) = 3b6fc88653a5e3f44b8a0a6059ec1a102c874e70
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index 4542578891c..6bc93da7716 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.19 2004/04/24 09:29:54 jmmv Exp $
+$NetBSD: patch-aa,v 1.20 2004/05/06 13:44:00 jmmv Exp $
--- src/gtkimhtml.c.orig Fri Apr 23 04:24:05 2004
+++ src/gtkimhtml.c Sat Apr 24 05:37:14 2004
@@ -16,3 +16,31 @@ $NetBSD: patch-aa,v 1.19 2004/04/24 09:29:54 jmmv Exp $
if (info == TARGET_HTML) {
int len;
+@@ -684,7 +685,6 @@
+ static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data)
+ {
+ char *text;
+- guint16 c;
+ GtkIMHtml *imhtml = data;
+ GtkTextIter iter;
+ GtkIMHtmlOptions flags = GTK_IMHTML_NO_NEWLINE;
+@@ -756,14 +756,14 @@
+ memcpy(text, selection_data->data, selection_data->length);
+ }
+
+- memcpy (&c, text, 2);
+- if (c == 0xfeff) {
+- /* This is UCS2 */
+- char *utf8 = g_convert(text+2, selection_data->length - 2, "UTF-8", "UCS-2", NULL, NULL, NULL);
++ if (selection_data->length >= 2 &&
++ (*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
++ /* This is UCS-2 */
++ char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL);
+ g_free(text);
+ text = utf8;
+ if (!text) {
+- gaim_debug_warning("gtkimhtml", "g_convert failed in paste_received_cb\n");
++ gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n");
+ return;
+ }
+ }