5 files changed, 72 insertions, 22 deletions

diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 8b3ef64c9e46..13b8a1b5982a 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webkit
-PORTVERSION=	${QT4_VERSION}
+DISTVERSION=	${QT4_VERSION}
 CATEGORIES?=	www
 PKGNAMEPREFIX=	qt4-
 
@@ -14,8 +14,9 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 WebKit engine
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui network xml \
-		dbus phonon phonon-gst script scripttools xmlpatterns
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib declarative gui \
+		network xml dbus phonon phonon-gst script scripttools \
+		xmlpatterns
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
@@ -29,18 +30,17 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH MAKEOBJDIR=.
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
-		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
-		src/qt3support src/s60installs src/s60main src/scripttools \
-		src/sql src/svg src/testlib src/tools src/winmain \
-		src/3rdparty/clucene src/3rdparty/freetype \
-		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
-		src/3rdparty/libtiff
+		src/activeqt src/dbus src/opengl src/openvg src/qt3support \
+		src/s60installs src/s60main src/scripttools src/sql src/svg \
+		src/testlib src/tools src/winmain src/3rdparty/clucene \
+		src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \
+		src/3rdparty/libpng src/3rdparty/libtiff
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-BUILD_WRKSRC=	${WRKSRC}/src/3rdparty/${PORTNAME}/WebCore
+BUILD_WRKSRC=	${WRKSRC}/src/3rdparty/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	-I../../../../include/Qt -I../../../../include
@@ -52,14 +52,22 @@ pre-configure:
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${REINPLACE_CMD} -e '/WebKit\/qt\/tests/ d' \
+		${BUILD_WRKSRC}/WebKit.pro
 
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|.*$$(QMAKE).*||g' \
-		${BUILD_WRKSRC}/Makefile
+		-e '/^CFLAGS/ s|-I${LOCALBASE}/include ||g' \
+		-e '/^CXXFLAGS/ s|-I${LOCALBASE}/include ||g' \
+		${BUILD_WRKSRC}/WebCore/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 		${WRKSRC}/lib/pkgconfig/QtWebKit.pc
+#QtWebKit is statically linked with jscore, remove the latest
+	${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||;s|-ljscore||' \
+		${WRKSRC}/lib/pkgconfig/QtWebKit.pc \
+		${WRKSRC}/lib/libQtWebKit.la
 
 .include <bsd.port.mk>
diff --git a/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-runtime_JSValue.h b/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-runtime_JSValue.h
index 970348aec7be..c9bf3296c942 100644
--- a/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-runtime_JSValue.h
+++ b/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-runtime_JSValue.h
@@ -1,6 +1,6 @@
---- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig	2010-03-23 23:39:05.000000000 +0100
-+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h	2010-03-23 23:44:23.000000000 +0100
-@@ -476,7 +476,11 @@
+--- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig	2010-05-22 11:09:21.423802590 +0200
++++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h	2010-05-22 11:31:33.896924042 +0200
+@@ -491,7 +491,11 @@
              u.asBits.tag = CellTag;
          else
              u.asBits.tag = EmptyValueTag;
@@ -9,10 +9,10 @@
 +#else
          u.asBits.payload = reinterpret_cast<int32_t>(ptr);
 +#endif
-     }
- 
-     inline JSValue::JSValue(const JSCell* ptr)
-@@ -485,7 +489,11 @@
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
+@@ -503,7 +507,11 @@
              u.asBits.tag = CellTag;
          else
              u.asBits.tag = EmptyValueTag;
@@ -21,6 +21,6 @@
 +#else
          u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
 +#endif
-     }
- 
-     inline JSValue::operator bool() const
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
diff --git a/www/qt4-webkit/files/patch-src__3rdparty__webkit__JavaScriptCore__wtf__Platform.h b/www/qt4-webkit/files/patch-src__3rdparty__webkit__JavaScriptCore__wtf__Platform.h
new file mode 100644
index 000000000000..5e1f4a2e5067
--- /dev/null
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__JavaScriptCore__wtf__Platform.h
@@ -0,0 +1,23 @@
+--- ./src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.orig	2010-09-10 09:05:22.000000000 +0000
++++ ./src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h	2010-11-04 11:29:10.000000000 +0000
+@@ -937,6 +937,11 @@
+     #define ENABLE_JIT 1
+ #elif CPU(ARM_TRADITIONAL) && OS(LINUX)
+     #define ENABLE_JIT 1
++#elif CPU(X86) && OS(FREEBSD) && GCC_VERSION >= 40100
++    #define ENABLE_JIT 1
++    #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
++#elif CPU(X86_64) && OS(FREEBSD) && GCC_VERSION >= 40100
++    #define ENABLE_JIT 1
+ #endif
+ #endif /* PLATFORM(QT) */
+ 
+@@ -1007,6 +1012,8 @@
+     || (CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100) \
+     || (CPU(ARM_TRADITIONAL) && OS(LINUX)) \
+     || (CPU(MIPS) && OS(LINUX)) \
++    || (CPU(X86) && OS(FREEBSD) && GCC_VERSION >= 40100) \
++    || (CPU(X86_64) && OS(FREEBSD) && GCC_VERSION >= 40100) \
+     || (CPU(X86) && OS(DARWIN)) \
+     || (CPU(X86_64) && OS(DARWIN))
+ #define ENABLE_YARR 1
diff --git a/www/qt4-webkit/files/patch-src__3rdparty__webkit__WebCore__WebCore.pro b/www/qt4-webkit/files/patch-src__3rdparty__webkit__WebCore__WebCore.pro
new file mode 100644
index 000000000000..89db1606d771
--- /dev/null
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__WebCore__WebCore.pro
@@ -0,0 +1,11 @@
+--- ./src/3rdparty/webkit/WebCore/WebCore.pro.orig	2010-11-06 04:55:21.000000000 +0300
++++ ./src/3rdparty/webkit/WebCore/WebCore.pro	2010-11-11 12:50:15.632322975 +0300
+@@ -82,7 +82,7 @@
+     symbian: TARGET =$$TARGET$${QT_LIBINFIX}
+ }
+ moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri
+-isEmpty(QT_BUILD_TREE):include($$moduleFile)
++include($$moduleFile)
+ VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
+ 
+ unix {
diff --git a/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist
index 9c8cb8f7b230..ff9024b0d470 100644
--- a/www/qt4-webkit/pkg-plist
+++ b/www/qt4-webkit/pkg-plist
@@ -43,14 +43,22 @@ include/qt4/QtWebKit/qwebpluginfactory.h
 include/qt4/QtWebKit/qwebsecurityorigin.h
 include/qt4/QtWebKit/qwebsettings.h
 include/qt4/QtWebKit/qwebview.h
+lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
+%%DEBUG%%lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so.debug
+lib/qt4/imports/QtWebKit/qmldir
 lib/qt4/libQtWebKit.la
 lib/qt4/libQtWebKit.prl
 lib/qt4/libQtWebKit.so
 lib/qt4/libQtWebKit.so.4
 lib/qt4/libQtWebKit.so.%%SHLIB_SHVER%%
 lib/qt4/libQtWebKit.so.%%SHLIB_VER%%
-@comment %%DEBUG%%lib/qt4/libQtWebKit.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtWebKit.pc
+share/qt4/mkspecs/modules/qt_webkit_version.pri
+@dirrmtry share/qt4/mkspecs/modules
+@dirrmtry share/qt4/mkspecs
+@dirrmtry share/qt4
+@dirrm lib/qt4/imports/QtWebKit
+@dirrmtry lib/qt4/imports
 @dirrmtry lib/qt4
 @dirrm include/qt4/QtWebKit
 @dirrmtry include/qt4/Qt