Fix the build with new gtk20.

Reported by:	pointyhat-exp


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

5 files changed, 123 insertions, 0 deletions

diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
new file mode 100644
index 000000000..6f109ade8
--- /dev/null
+++ b/www/osb-nrcore/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	osb-nrcore
+# Date created:		2004-11-29
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	osb-nrcore
+PORTVERSION=	0.5.2
+PORTREVISION=	1
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gtk-webcore
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Gtk+ WebCore html rendering engine
+
+BUILD_DEPENDS=	osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore
+RUN_DEPENDS=	osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore
+
+USE_GNOME=	gnomehack gnometarget gtk20
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
+		LDFLAGS="${PTHREAD_LIBS}"
+USE_LDCONFIG=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "alpha"
+BROKEN=		Does not compile on alpha
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/test/s|==|=|g ; \
+		 s|-nostdinc++||g ; \
+		 s|-nodefaultlibs -lgcc -lc||g; \
+		 s|-D.*_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/www/osb-nrcore/distinfo b/www/osb-nrcore/distinfo
new file mode 100644
index 000000000..7438701e6
--- /dev/null
+++ b/www/osb-nrcore/distinfo
@@ -0,0 +1,3 @@
+MD5 (osb-nrcore-0.5.2.tar.gz) = 4c1b8ab85e44fb96d09cb73b41ecaddb
+SHA256 (osb-nrcore-0.5.2.tar.gz) = ae96d293dfa45df5acdcd468b4246851efc9daf9dd5fe303bcd2dc5f802fa5be
+SIZE (osb-nrcore-0.5.2.tar.gz) = 2129542
diff --git a/www/osb-nrcore/files/patch-khtml-html-html_doumentimp.cpp b/www/osb-nrcore/files/patch-khtml-html-html_doumentimp.cpp
new file mode 100644
index 000000000..f63463e27
--- /dev/null
+++ b/www/osb-nrcore/files/patch-khtml-html-html_doumentimp.cpp
@@ -0,0 +1,23 @@
+--- khtml/html/html_documentimpl.cpp.orig	2007-08-08 13:44:11.000000000 +0200
++++ khtml/html/html_documentimpl.cpp	2007-08-08 13:45:49.000000000 +0200
+@@ -270,7 +270,7 @@
+ 	return;
+     }
+  
+-    int oldCount = (int)namedImageAndFormCounts.find(name);
++    intptr_t oldCount = (intptr_t)namedImageAndFormCounts.find(name);
+     namedImageAndFormCounts.insert(name, (char *)(oldCount + 1));
+ }
+ 
+@@ -280,9 +280,9 @@
+ 	return;
+     }
+  
+-    int oldVal = (int)(namedImageAndFormCounts.find(name));
++    intptr_t oldVal = (intptr_t)(namedImageAndFormCounts.find(name));
+     if (oldVal != 0) {
+-	int newVal = oldVal - 1;
++	intptr_t newVal = oldVal - 1;
+ 	if (newVal == 0) {
+ 	    namedImageAndFormCounts.remove(name);
+ 	} else {
diff --git a/www/osb-nrcore/pkg-descr b/www/osb-nrcore/pkg-descr
new file mode 100644
index 000000000..7fcf88937
--- /dev/null
+++ b/www/osb-nrcore/pkg-descr
@@ -0,0 +1,10 @@
+Gtk+ WebCore is a Gtk+ port of Apple Computer Inc.'s WebCore KHTML html
+rendering engine including a web component. Gtk+ WebCore is a standards
+compliant (X)HTML rendering engine, javascript interpreter and an embeddable
+web component. The purpose of the web component is to be a light-weight,
+easy-to-compile and embed, open source rendering component.
+
+NRCore contains KHTML html rendering engine KWIQ -Qt adaptation layer and
+bridge classes for WebKit controls. Based on WebCore-146.1
+
+WWW:	http://gtk-webcore.sourceforge.net/
diff --git a/www/osb-nrcore/pkg-plist b/www/osb-nrcore/pkg-plist
new file mode 100644
index 000000000..c13cc9637
--- /dev/null
+++ b/www/osb-nrcore/pkg-plist
@@ -0,0 +1,48 @@
+include/osb/NRCore/KWIQCGColor.h
+include/osb/NRCore/KWIQCGContext.h
+include/osb/NRCore/KWIQCGContextFactory.h
+include/osb/NRCore/KWIQCGImage.h
+include/osb/NRCore/KWIQPageCache.h
+include/osb/NRCore/WebCoreBridge.h
+include/osb/NRCore/WebCoreCache.h
+include/osb/NRCore/WebCoreCookieAdapter.h
+include/osb/NRCore/WebCoreDeviceType.h
+include/osb/NRCore/WebCoreFoundation.h
+include/osb/NRCore/WebCoreHistory.h
+include/osb/NRCore/WebCoreImageRenderer.h
+include/osb/NRCore/WebCoreImageRendererFactory.h
+include/osb/NRCore/WebCoreKeyboardAccess.h
+include/osb/NRCore/WebCoreResourceLoader.h
+include/osb/NRCore/WebCoreResponse.h
+include/osb/NRCore/WebCoreSettings.h
+include/osb/NRCore/WebCoreTextRenderer.h
+include/osb/NRCore/WebCoreTextRendererFactory.h
+include/osb/NRCore/WebCoreUnicode.h
+include/osb/NRCore/WebCoreViewFactory.h
+lib/libnrcore.a
+lib/libnrcore.la
+lib/libnrcore.so
+lib/libnrcore.so.0
+lib/libnrcore_kwiq_gtk.a
+lib/libnrcore_kwiq_gtk.la
+lib/libnrcore_kwiq_gtk.so
+lib/libnrcore_kwiq_gtk.so.0
+libdata/pkgconfig/osb-nrcore.pc
+%%DATADIR%%/eastResizeCursor.tiff
+%%DATADIR%%/helpCursor.tiff
+%%DATADIR%%/html4.css
+%%DATADIR%%/linkCursor.tiff
+%%DATADIR%%/moveCursor.tiff
+%%DATADIR%%/northEastResizeCursor.tiff
+%%DATADIR%%/northResizeCursor.tiff
+%%DATADIR%%/northWestResizeCursor.tiff
+%%DATADIR%%/quirks.css
+%%DATADIR%%/southEastResizeCursor.tiff
+%%DATADIR%%/southResizeCursor.tiff
+%%DATADIR%%/southWestResizeCursor.tiff
+%%DATADIR%%/user.css
+%%DATADIR%%/waitCursor.tiff
+%%DATADIR%%/westResizeCursor.tiff
+@dirrm %%DATADIR%%
+@dirrm include/osb/NRCore
+@dirrmtry include/osb