Fix build with new glib20.

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

5 files changed, 239 insertions, 0 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
new file mode 100644
index 000000000..d92dd04ff
--- /dev/null
+++ b/www/gtkhtml3/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for:	gtkhtml3
+# Date created:				12 March 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/www/gtkhtml3/Makefile,v 1.123 2011/09/23 22:26:01 amdmi3 Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.180 2011/03/19 17:33:16 mezz Exp $
+#
+
+PORTNAME=	gtkhtml3
+PORTVERSION=	3.32.1
+PORTREVISION=	1
+CATEGORIES=	www gnome
+MASTER_SITES=	GNOME
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Lightweight HTML rendering/printing/editing engine
+
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
+		enchant.1:${PORTSDIR}/textproc/enchant
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_SUB=	VERSION="3.14"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
+	    	${WRKSRC}/intltool-merge.in
+	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g ; \
+		s|-DGTK_DISABLE_DEPRECATED||g ; \
+	    	s|-DGDK_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|gtkhtml-editor-test[$$]|gtkhtml3-editor-test$$|' \
+	    	${WRKSRC}/components/editor/Makefile.in
+	@${REINPLACE_CMD} -e 's|G_CONST_RETURN||g' \
+		${WRKSRC}/a11y/*.[ch]
+
+.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
new file mode 100644
index 000000000..59301a05e
--- /dev/null
+++ b/www/gtkhtml3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gtkhtml-3.32.1.tar.bz2) = 78b6da6c1f4f61947f77de505a626a028ee3ecb6ad3c7c06cc4a6273e16d95c6
+SIZE (gnome2/gtkhtml-3.32.1.tar.bz2) = 1196875
diff --git a/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c b/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c
new file mode 100644
index 000000000..ec390b5d8
--- /dev/null
+++ b/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c
@@ -0,0 +1,13 @@
+--- components/editor/gtkhtml-spell-dialog.c.orig	2010-09-19 17:57:00.000000000 +0000
++++ components/editor/gtkhtml-spell-dialog.c	2010-09-19 17:57:41.000000000 +0000
+@@ -443,7 +443,9 @@ spell_dialog_init (GtkhtmlSpellDialog *d
+ 
+ 	gtk_dialog_add_button (
+ 		GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++#if !GTK_CHECK_VERSION(2,90,7)
++	g_object_set (dialog, "has-separator", FALSE, NULL);
++#endif
+ 	gtk_window_set_title (GTK_WINDOW (dialog), _("Spell Checker"));
+ 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ 
diff --git a/www/gtkhtml3/pkg-descr b/www/gtkhtml3/pkg-descr
new file mode 100644
index 000000000..38451dc01
--- /dev/null
+++ b/www/gtkhtml3/pkg-descr
@@ -0,0 +1,3 @@
+GtkHTML is a lightweight HTML rendering, printing, and editing engine.
+
+WWW: http://www.ximian.com/
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
new file mode 100644
index 000000000..fe5d58315
--- /dev/null
+++ b/www/gtkhtml3/pkg-plist
@@ -0,0 +1,169 @@
+bin/gtkhtml3-editor-test
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-actions.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-common.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-widgets.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-spell-checker.h
+include/libgtkhtml-%%VERSION%%/editor/gtkhtml-spell-language.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
+include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
+lib/libgtkhtml-%%VERSION%%.a
+lib/libgtkhtml-%%VERSION%%.la
+lib/libgtkhtml-%%VERSION%%.so
+lib/libgtkhtml-%%VERSION%%.so.19
+lib/libgtkhtml-editor-%%VERSION%%.a
+lib/libgtkhtml-editor-%%VERSION%%.la
+lib/libgtkhtml-editor-%%VERSION%%.so
+lib/libgtkhtml-editor-%%VERSION%%.so.0
+libdata/pkgconfig/gtkhtml-editor-%%VERSION%%.pc
+libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-builder.ui
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-manager.ui
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/locale/af/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ast/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/en@shaw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mai/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sr@latin/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrm share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
+@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
+@dirrm include/libgtkhtml-%%VERSION%%/editor
+@dirrm include/libgtkhtml-%%VERSION%%
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as