summaryrefslogtreecommitdiff
path: root/www/gtkhtml
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-12-24 17:59:15 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-12-24 17:59:15 +0000
commit5beaf51b8bd3248b1ca06df78a41c60207befa9e (patch)
treececff7d79543281e23567652c7af17ed86f2d37d /www/gtkhtml
parentDon't statically link the Pilot conduits. This fixes a problem where (diff)
Fix a bug where text copied from Mozilla or Galeon could not be pasted
into The GtkHTML editor (e.g. into Evolution's mail composer). Approved by: portmgr (lioux)
Notes
Notes: svn path=/head/; revision=71836
Diffstat (limited to 'www/gtkhtml')
-rw-r--r--www/gtkhtml/Makefile2
-rw-r--r--www/gtkhtml/files/patch-src_gtkhtml.c37
2 files changed, 38 insertions, 1 deletions
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index b011dbf049a7..6947465f8402 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
diff --git a/www/gtkhtml/files/patch-src_gtkhtml.c b/www/gtkhtml/files/patch-src_gtkhtml.c
new file mode 100644
index 000000000000..7532eed7d35c
--- /dev/null
+++ b/www/gtkhtml/files/patch-src_gtkhtml.c
@@ -0,0 +1,37 @@
+--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
++++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
+@@ -1653,9 +1653,9 @@
+ be = swap ? be : !be;
+
+ if (be)
+- return "ucs2-be";
++ return "ucs-2be";
+ else
+- return "ucs2-le";
++ return "ucs-2le";
+
+ }
+
+@@ -1733,7 +1733,7 @@
+ html_object_save (selection_object, state);
+
+ d_s (g_warning ("text/html buffer = %s", buffer->str);)
+- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
++ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
+
+ if (selection_string)
+ gtk_selection_data_set (selection_data,
+@@ -1897,11 +1897,11 @@
+ len -= 2;
+ break;
+ default:
+- tocode = "ucs2";
++ tocode = ucs2_order(1);
+ break;
+ }
+
+- utf8 = e_utf8_from_charset_string_sized ("ucs2",
++ utf8 = e_utf8_from_charset_string_sized (tocode,
+ data,
+ len);
+