Fix build with gtkhtml-1.1.

Reported by:	bento
Adapted from:	GNOME CVS

4 files changed, 292 insertions, 1 deletions

diff --git a/www/p5-GtkHTML/Makefile b/www/p5-GtkHTML/Makefile
index 7e902cb..84a490e 100644
--- a/www/p5-GtkHTML/Makefile
+++ b/www/p5-GtkHTML/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	vanilla@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gtkhtml
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
diff --git a/www/p5-GtkHTML/files/patch-pkg.defs b/www/p5-GtkHTML/files/patch-pkg.defs
new file mode 100644
index 0000000..b9a61c2
--- /dev/null
+++ b/www/p5-GtkHTML/files/patch-pkg.defs
@@ -0,0 +1,10 @@
+--- pkg.defs.orig	Sun Dec  1 21:05:22 2002
++++ pkg.defs	Sun Dec  1 21:05:33 2002
+@@ -61,7 +61,6 @@
+   (remove-link GTK_HTML_COMMAND_REMOVE_LINK)
+   (delete GTK_HTML_COMMAND_DELETE)
+   (delete-back GTK_HTML_COMMAND_DELETE_BACK)
+-  (set-mark GTK_HTML_COMMAND_SET_MARK)
+   (disable-selection GTK_HTML_COMMAND_DISABLE_SELECTION)
+   (bold-on GTK_HTML_COMMAND_BOLD_ON)
+   (bold-off GTK_HTML_COMMAND_BOLD_OFF)
diff --git a/www/p5-GtkHTML/files/patch-xs_GtkHTML.xs b/www/p5-GtkHTML/files/patch-xs_GtkHTML.xs
new file mode 100644
index 0000000..a86a9b7
--- /dev/null
+++ b/www/p5-GtkHTML/files/patch-xs_GtkHTML.xs
@@ -0,0 +1,269 @@
+--- xs/GtkHTML.xs.orig	Sun Dec  1 20:58:50 2002
++++ xs/GtkHTML.xs	Sun Dec  1 21:03:24 2002
+@@ -6,6 +6,10 @@
+ #include "GtkDefs.h"
+ #include "GtkHTMLDefs.h"
+ 
++#ifdef GTKHTML_HAVE_GCONF
++#include <gconf/gconf.h>
++#endif
++
+ static void 
+ destroy_handler(gpointer data) {
+         SvREFCNT_dec((AV*)data);
+@@ -83,20 +87,61 @@
+ 		GtkHTML_InstallTypedefs();
+ 		GtkHTML_InstallObjects();
+ 		AddSignalHelperParts(gtk_html_get_type(), names, fixup_html, 0);
++#ifdef GTKHTML_HAVE_GCONF
++		/* gtkhtml is _so_ broken */
++		if (!gconf_is_initialized()) {
++			int argc;
++			char ** argv = 0;
++			AV * ARGV = perl_get_av("ARGV", FALSE);
++			SV * ARGV0 = perl_get_sv("0", FALSE);
++			int i;
++
++			argc = av_len(ARGV)+2;
++			if (argc) {
++				argv = malloc(sizeof(char*)*argc);
++				argv[0] = g_strdup(SvPV(ARGV0, PL_na));
++				for(i=0;i<=av_len(ARGV);i++)
++					argv[i+1] = g_strdup(SvPV(*av_fetch(ARGV, i, 0), PL_na));
++			}
++			gconf_init (argc, argv, NULL);
++			if (argv) {
++				for (i=0; i < argc; ++i)
++					g_free(argv[i]);
++				free(argv);
++			}
++		}
++#endif
+ 	}
+ 
+ Gtk::HTML_Sink
+ gtk_html_new (Class)
+ 	SV *	Class
+ 	CODE:
+-	RETVAL = GTK_HTML(gtk_html_new());
++	RETVAL = (GtkHTML*)(gtk_html_new());
+ 	OUTPUT:
+ 	RETVAL
+ 
+-void
+-gtk_html_set_iframe_parent (html, parent)
++#if GTKHTML_HVER >= 0x001000
++
++Gtk::HTML_Sink
++gtk_html_new_from_string (Class, html_data)
++	SV *	Class
++	SV *	html_data
++	CODE:
++	{
++		STRLEN len;
++		char *d = SvPV (html_data, len);
++		RETVAL = (GtkHTML*)(gtk_html_new_from_string(d, len));
++	}
++	OUTPUT:
++	RETVAL
++
++gulong
++gtk_html_begin_content (html, content_type)
+ 	Gtk::HTML	html
+-	Gtk::Widget	parent
++	char *		content_type
++
++#endif
+ 
+ gulong
+ gtk_html_begin (html)
+@@ -125,6 +170,17 @@
+ 	Gtk::HTML	html
+ 
+ void
++gtk_html_load_from_string (html, data)
++	Gtk::HTML	html
++	SV *		data
++	CODE:
++	{
++		STRLEN blen;
++		char *buf = SvPV(data, blen);
++		gtk_html_load_from_string (html, buf, blen);
++	}
++
++void
+ gtk_html_set_editable (html, editable)
+ 	Gtk::HTML	html
+ 	bool	editable
+@@ -138,22 +194,158 @@
+ 	Gtk::HTML	html
+ 	bool	allow
+ 
++#if GTKHTML_HVER < 0x000a00
++	
+ int
+ gtk_html_request_paste (html, type, time)
+ 	Gtk::HTML	html
+ 	int	type
+ 	int	time
+ 
++#else
++
++int
++gtk_html_request_paste (html, selection, type, time, as_cite)
++	Gtk::HTML	html
++	Gtk::Gdk::Atom	selection
++	int	type
++	int	time
++	gboolean	as_cite
++
++#endif
++
++#if GTKHTML_HVER >= 0x001000
++
+ void
+-gtk_html_set_paragraph_style (html, style)
++gtk_html_select_word (html)
+ 	Gtk::HTML	html
+-	Gtk::HTMLParagraphStyle	style
++
++void
++gtk_html_select_line (html)
++	Gtk::HTML	html
++
++void
++gtk_html_select_paragraph (html)
++	Gtk::HTML	html
++
++void
++gtk_html_select_paragraph_extended (html)
++	Gtk::HTML	html
++
++void
++gtk_html_select_all (html)
++	Gtk::HTML	html
++
++void
++gtk_html_modify_indent_by_delta (html, delta)
++	Gtk::HTML	html
++	int	delta
++
++Gtk::HTMLParagraphStyle
++gtk_html_get_paragraph_style (html)
++	Gtk::HTML	html
++
++void
++gtk_html_set_color (html, color)
++	Gtk::HTML	html
++	Gtk::Gdk::Color	color
++	CODE:
++	{
++		HTMLColor *c = html_color_new_from_gdk_color (color);
++		gtk_html_set_color (html, c);
++		html_color_unref (color);
++	}
++
++void
++gtk_html_insert_html (html, html_src)
++	Gtk::HTML	html
++	char *	html_src
++
++void
++gtk_html_append_html (html, html_src)
++	Gtk::HTML	html
++	char *	html_src
++
++void
++gtk_html_set_default_content_type (html, content_type)
++	Gtk::HTML	html
++	char *	content_type
++
++bool
++gtk_html_command (html, command_name)
++	Gtk::HTML	html
++	char *	command_name
++
++bool
++gtk_html_edit_make_cursor_visible (html)
++	Gtk::HTML	html
++
++bool
++gtk_html_build_with_gconf (Class)
++	SV *	Class
++	CODE:
++	RETVAL = gtk_html_build_with_gconf ();
++	OUTPUT:
++	RETVAL
++
++void
++gtk_html_set_magnification (html, magnification)
++	Gtk::HTML	html
++	gdouble	magnification
++
++void
++gtk_html_zoom_in (html)
++	Gtk::HTML	html
++
++void
++gtk_html_zoom_out (html)
++	Gtk::HTML	html
++
++void
++gtk_html_zoom_reset (html)
++	Gtk::HTML	html
++
++void
++gtk_html_update_styles (html)
++	Gtk::HTML	html
++
++void
++gtk_html_set_allow_frameset (html, allow)
++	Gtk::HTML	html
++	bool	allow
++
++bool
++gtk_html_get_allow_frameset (html)
++	Gtk::HTML	html
++
++void
++gtk_html_set_base (html, url)
++	Gtk::HTML	html
++	char *	url
++
++char*
++gtk_html_get_base (html)
++	Gtk::HTML	html
++
++void
++gtk_html_set_indent (html, delta)
++	Gtk::HTML	html
++	int	delta
++
++#else
+ 
+ void
+ gtk_html_indent (html, delta)
+ 	Gtk::HTML	html
+ 	int	delta
+ 
++#endif
++
++void
++gtk_html_set_paragraph_style (html, style)
++	Gtk::HTML	html
++	Gtk::HTMLParagraphStyle	style
++
+ void
+ gtk_html_set_font_style (html, and_mask, or_mask)
+ 	Gtk::HTML	html
+@@ -174,8 +366,9 @@
+ 	Gtk::HTML	html
+ 
+ void
+-gtk_html_paste (html)
++gtk_html_paste (html, as_cite)
+ 	Gtk::HTML	html
++	gboolean	as_cite
+ 
+ void
+ gtk_html_copy (html)
diff --git a/www/p5-GtkHTML/files/patch-xs_GtkHTMLEmbedded.xs b/www/p5-GtkHTML/files/patch-xs_GtkHTMLEmbedded.xs
new file mode 100644
index 0000000..0760cde
--- /dev/null
+++ b/www/p5-GtkHTML/files/patch-xs_GtkHTMLEmbedded.xs
@@ -0,0 +1,11 @@
+--- xs/GtkHTMLEmbedded.xs.orig	Sun Dec  1 21:06:22 2002
++++ xs/GtkHTMLEmbedded.xs	Sun Dec  1 21:06:29 2002
+@@ -20,7 +20,7 @@
+ 	int	width
+ 	int	height
+ 	CODE:
+-	RETVAL = GTK_HTML_EMBEDDED(gtk_html_embedded_new(classid, name, type, width, height));
++	RETVAL = (GtkHTMLEmbedded*)(gtk_html_embedded_new(classid, name, type, width, height));
+ 	OUTPUT:
+ 	RETVAL
+