Update to 1.1.8.

9 files changed, 6 insertions, 117 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 485166011d37..20a429650205 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index be58c05ab25c..2d04d6661dc7 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.1.7.tar.bz2) = 83cd60ab9a108d2a0d65b3bf760affa4
+MD5 (gnome/gtkhtml-1.1.8.tar.bz2) = ea64ac887b834573d4ee6279926ba245
diff --git a/www/gtkhtml/files/patch-src_gtkhtml.c b/www/gtkhtml/files/patch-src_gtkhtml.c
deleted file mode 100644
index 7532eed7d35c..000000000000
--- a/www/gtkhtml/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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);
- 
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 485166011d37..20a429650205 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index be58c05ab25c..2d04d6661dc7 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.1.7.tar.bz2) = 83cd60ab9a108d2a0d65b3bf760affa4
+MD5 (gnome/gtkhtml-1.1.8.tar.bz2) = ea64ac887b834573d4ee6279926ba245
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
deleted file mode 100644
index 7532eed7d35c..000000000000
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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);
- 
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 485166011d37..20a429650205 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index be58c05ab25c..2d04d6661dc7 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.1.7.tar.bz2) = 83cd60ab9a108d2a0d65b3bf760affa4
+MD5 (gnome/gtkhtml-1.1.8.tar.bz2) = ea64ac887b834573d4ee6279926ba245
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
deleted file mode 100644
index 7532eed7d35c..000000000000
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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);
-