Update to 3.5.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3232 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 66 insertions, 8 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index ecbf78f8e..475ebeeb7 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.5.0
+PORTVERSION=	3.5.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.5
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 44acccdce..d529eead5 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.5.0.tar.bz2) = cfc9e9e3c1ba5d470d22e3eb13f93247
-SIZE (gnome2/gtkhtml-3.5.0.tar.bz2) = 1343373
+MD5 (gnome2/gtkhtml-3.5.1.tar.bz2) = 05a8ab1cb3c86d100b5da591acf4ae30
+SIZE (gnome2/gtkhtml-3.5.1.tar.bz2) = 1343900
diff --git a/www/gtkhtml3/files/patch-src_htmlgdkpainter.c b/www/gtkhtml3/files/patch-src_htmlgdkpainter.c
new file mode 100644
index 000000000..af82d605b
--- /dev/null
+++ b/www/gtkhtml3/files/patch-src_htmlgdkpainter.c
@@ -0,0 +1,14 @@
+--- src/htmlgdkpainter.c.orig	Wed Dec  8 01:43:54 2004
++++ src/htmlgdkpainter.c	Wed Dec  8 01:44:12 2004
+@@ -740,9 +740,10 @@
+ item_gc (HTMLPainter *p, PangoItem *item, GdkDrawable *drawable, GdkGC *orig_gc, HTMLPangoProperties *properties, GdkGC **bg_gc)
+ {
+ 	GdkGC *new_gc = NULL;
++	HTMLEngine *e;
+ 	html_pango_get_item_properties (item, properties);
+ 
+-	HTMLEngine *e = GTK_HTML (p->widget)->engine;
++	e = GTK_HTML (p->widget)->engine;
+ 
+ 	*bg_gc = NULL;
+ 
diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c
new file mode 100644
index 000000000..f970e5b65
--- /dev/null
+++ b/www/gtkhtml3/files/patch-src_htmltext.c
@@ -0,0 +1,15 @@
+--- src/htmltext.c.orig	Wed Dec  8 01:45:57 2004
++++ src/htmltext.c	Wed Dec  8 01:46:10 2004
+@@ -2433,10 +2433,11 @@
+ gsize
+ html_text_sanitize (const gchar **str, gint *len)
+ {
++	gchar *end;
+ 	g_return_val_if_fail (str != NULL, 0);
+ 	g_return_val_if_fail (len != NULL, 0);
+ 	
+-	gchar *end = offset_to_pointer_validated (*str, *len, len);
++	end = offset_to_pointer_validated (*str, *len, len);
+ 	if (end) {
+ 		return end - *str;
+ 	} else {
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index b020dcb99..ebfb2f8fe 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.12
+lib/libgtkhtml-%%VERSION%%.so.13
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index ecbf78f8e..475ebeeb7 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.5.0
+PORTVERSION=	3.5.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.5
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 44acccdce..d529eead5 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.5.0.tar.bz2) = cfc9e9e3c1ba5d470d22e3eb13f93247
-SIZE (gnome2/gtkhtml-3.5.0.tar.bz2) = 1343373
+MD5 (gnome2/gtkhtml-3.5.1.tar.bz2) = 05a8ab1cb3c86d100b5da591acf4ae30
+SIZE (gnome2/gtkhtml-3.5.1.tar.bz2) = 1343900
diff --git a/www/gtkhtml38/files/patch-src_htmlgdkpainter.c b/www/gtkhtml38/files/patch-src_htmlgdkpainter.c
new file mode 100644
index 000000000..af82d605b
--- /dev/null
+++ b/www/gtkhtml38/files/patch-src_htmlgdkpainter.c
@@ -0,0 +1,14 @@
+--- src/htmlgdkpainter.c.orig	Wed Dec  8 01:43:54 2004
++++ src/htmlgdkpainter.c	Wed Dec  8 01:44:12 2004
+@@ -740,9 +740,10 @@
+ item_gc (HTMLPainter *p, PangoItem *item, GdkDrawable *drawable, GdkGC *orig_gc, HTMLPangoProperties *properties, GdkGC **bg_gc)
+ {
+ 	GdkGC *new_gc = NULL;
++	HTMLEngine *e;
+ 	html_pango_get_item_properties (item, properties);
+ 
+-	HTMLEngine *e = GTK_HTML (p->widget)->engine;
++	e = GTK_HTML (p->widget)->engine;
+ 
+ 	*bg_gc = NULL;
+ 
diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c
new file mode 100644
index 000000000..f970e5b65
--- /dev/null
+++ b/www/gtkhtml38/files/patch-src_htmltext.c
@@ -0,0 +1,15 @@
+--- src/htmltext.c.orig	Wed Dec  8 01:45:57 2004
++++ src/htmltext.c	Wed Dec  8 01:46:10 2004
+@@ -2433,10 +2433,11 @@
+ gsize
+ html_text_sanitize (const gchar **str, gint *len)
+ {
++	gchar *end;
+ 	g_return_val_if_fail (str != NULL, 0);
+ 	g_return_val_if_fail (len != NULL, 0);
+ 	
+-	gchar *end = offset_to_pointer_validated (*str, *len, len);
++	end = offset_to_pointer_validated (*str, *len, len);
+ 	if (end) {
+ 		return end - *str;
+ 	} else {
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index b020dcb99..ebfb2f8fe 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.12
+lib/libgtkhtml-%%VERSION%%.so.13
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl