9 files changed, 45 insertions, 69 deletions

diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 38109bc25b0b..4c6cbe4d0ae4 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -13,8 +13,10 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 WebKit engine
 
+USE_GNOME=	glib20
+USE_GSTREAMER=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib declarative gui network phonon \
+QT_COMPONENTS=	corelib declarative gui network \
 		qmake_build moc_build rcc_build
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
@@ -40,7 +42,7 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-BUILD_WRKSRC=	${WRKSRC}/src/3rdparty/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/src/3rdparty/${PORTNAME}/Source
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	-I../../../../include/Qt -I../../../../include
@@ -52,6 +54,8 @@ 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
+	# Avoid building and installing several tests. Should this be
+	# made an option?
 	${REINPLACE_CMD} -e '/WebKit\/qt\/tests/ d' \
 		${BUILD_WRKSRC}/WebKit.pro
 
@@ -61,12 +65,16 @@ post-configure:
 		-e 's|.*$$(QMAKE).*||g' \
 		-e '/^CFLAGS/ s|-I${LOCALBASE}/include ||g' \
 		-e '/^CXXFLAGS/ s|-I${LOCALBASE}/include ||g' \
-		${BUILD_WRKSRC}/WebCore/Makefile
+		${BUILD_WRKSRC}/Makefile \
+		${BUILD_WRKSRC}/WebCore/Makefile \
+		${BUILD_WRKSRC}/WebKit/qt/Makefile
+	${CP} ${BUILD_WRKSRC}/WebKit/qt/Makefile \
+		${BUILD_WRKSRC}/WebKit/qt/Makefile.QtWebKit
 	${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||' \
+	# 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
 
diff --git a/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-jit-JITStubs.cpp b/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-jit-JITStubs.cpp
deleted file mode 100644
index 8e96e2491c55..000000000000
--- a/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-jit-JITStubs.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp.orig	2010-11-06 02:55:20.000000000 +0100
-+++ src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp	2011-01-17 14:32:18.000000000 +0100
-@@ -77,7 +77,7 @@
- #define THUMB_FUNC_PARAM(name)
- #endif
- 
--#if OS(LINUX) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #else
- #define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name)
diff --git a/www/qt4-webkit/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-jit-JITStubs.cpp b/www/qt4-webkit/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp
index 4f2f4c038c8c..f68753f622ae 100644
--- a/www/qt4-webkit/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-jit-JITStubs.cpp
+++ b/www/qt4-webkit/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp
@@ -1,5 +1,5 @@
---- src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2010-11-06 02:55:22.000000000 +0100
-+++ src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp	2011-01-17 14:32:18.000000000 +0100
+--- ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2011-12-08 06:06:02.000000000 +0100
++++ ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp	2012-01-08 17:18:52.511348683 +0100
 @@ -80,7 +80,7 @@
  #define THUMB_FUNC_PARAM(name)
  #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
deleted file mode 100644
index 5e1f4a2e5067..000000000000
--- a/www/qt4-webkit/files/patch-src__3rdparty__webkit__JavaScriptCore__wtf__Platform.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./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-JavaScriptCore-runtime_JSValue.h b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
index c9bf3296c942..e2b4f74d54ac 100644
--- a/www/qt4-webkit/files/patch-src-3rdparty-webkit-JavaScriptCore-runtime_JSValue.h
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- ./src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h.orig	2011-12-08 06:06:02.000000000 +0100
++++ ./src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h	2012-01-08 17:18:52.511348683 +0100
+@@ -227,7 +227,11 @@
              u.asBits.tag = CellTag;
          else
              u.asBits.tag = EmptyValueTag;
@@ -12,7 +12,7 @@
  #if ENABLE(JSC_ZOMBIES)
          ASSERT(!isZombie());
  #endif
-@@ -503,7 +507,11 @@
+@@ -239,7 +243,11 @@
              u.asBits.tag = CellTag;
          else
              u.asBits.tag = EmptyValueTag;
diff --git a/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro
new file mode 100644
index 000000000000..994adda65917
--- /dev/null
+++ b/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro
@@ -0,0 +1,11 @@
+--- ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig	2011-12-08 06:06:03.000000000 +0100
++++ ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro	2012-01-08 17:18:52.521346053 +0100
+@@ -84,7 +84,7 @@
+ }
+ 
+ moduleFile=$$PWD/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}
+ 
+ symbian {
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
deleted file mode 100644
index 89db1606d771..000000000000
--- a/www/qt4-webkit/files/patch-src__3rdparty__webkit__WebCore__WebCore.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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/files/patch-src__3rdparty__webkit__WebCore__bindings__js__JSDOMBinding.h b/www/qt4-webkit/files/patch-src__3rdparty__webkit__WebCore__bindings__js__JSDOMBinding.h
deleted file mode 100644
index c6489f426abe..000000000000
--- a/www/qt4-webkit/files/patch-src__3rdparty__webkit__WebCore__bindings__js__JSDOMBinding.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h.orig	2011-06-30 11:23:39.846687664 +0200
-+++ ./src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h	2011-06-30 11:24:11.486683861 +0200
-@@ -225,7 +225,7 @@
-     {
-         if (!node)
-             return JSC::jsNull();
--        if (JSNode* wrapper = getCachedDOMNodeWrapper(exec, node->document(), node))
-+        if (JSC::JSCell* wrapper = getCachedDOMNodeWrapper(exec, node->document(), node))
-             return wrapper;
-         return createDOMNodeWrapper<WrapperClass>(exec, globalObject, node);
-     }
diff --git a/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist
index ff9024b0d470..101b5da42ea8 100644
--- a/www/qt4-webkit/pkg-plist
+++ b/www/qt4-webkit/pkg-plist
@@ -7,9 +7,11 @@ include/qt4/Qt/qwebhistory.h
 include/qt4/Qt/qwebhistoryinterface.h
 include/qt4/Qt/qwebinspector.h
 include/qt4/Qt/qwebkitglobal.h
+include/qt4/Qt/qwebkitplatformplugin.h
 include/qt4/Qt/qwebkitversion.h
 include/qt4/Qt/qwebpage.h
 include/qt4/Qt/qwebpluginfactory.h
+include/qt4/Qt/qwebscriptworld.h
 include/qt4/Qt/qwebsecurityorigin.h
 include/qt4/Qt/qwebsettings.h
 include/qt4/Qt/qwebview.h
@@ -18,15 +20,24 @@ include/qt4/QtWebKit/QWebDatabase
 include/qt4/QtWebKit/QWebElement
 include/qt4/QtWebKit/QWebElementCollection
 include/qt4/QtWebKit/QWebFrame
+include/qt4/QtWebKit/QWebFullScreenVideoHandler
+include/qt4/QtWebKit/QWebHapticFeedbackPlayer
 include/qt4/QtWebKit/QWebHistory
 include/qt4/QtWebKit/QWebHistoryInterface
 include/qt4/QtWebKit/QWebHistoryItem
 include/qt4/QtWebKit/QWebHitTestResult
 include/qt4/QtWebKit/QWebInspector
+include/qt4/QtWebKit/QWebKitPlatformPlugin
+include/qt4/QtWebKit/QWebNotificationData
+include/qt4/QtWebKit/QWebNotificationPresenter
 include/qt4/QtWebKit/QWebPage
 include/qt4/QtWebKit/QWebPluginFactory
+include/qt4/QtWebKit/QWebScriptWorld
 include/qt4/QtWebKit/QWebSecurityOrigin
+include/qt4/QtWebKit/QWebSelectData
+include/qt4/QtWebKit/QWebSelectMethod
 include/qt4/QtWebKit/QWebSettings
+include/qt4/QtWebKit/QWebTouchModifier
 include/qt4/QtWebKit/QWebView
 include/qt4/QtWebKit/QtWebKit
 include/qt4/QtWebKit/qgraphicswebview.h
@@ -37,9 +48,11 @@ include/qt4/QtWebKit/qwebhistory.h
 include/qt4/QtWebKit/qwebhistoryinterface.h
 include/qt4/QtWebKit/qwebinspector.h
 include/qt4/QtWebKit/qwebkitglobal.h
+include/qt4/QtWebKit/qwebkitplatformplugin.h
 include/qt4/QtWebKit/qwebkitversion.h
 include/qt4/QtWebKit/qwebpage.h
 include/qt4/QtWebKit/qwebpluginfactory.h
+include/qt4/QtWebKit/qwebscriptworld.h
 include/qt4/QtWebKit/qwebsecurityorigin.h
 include/qt4/QtWebKit/qwebsettings.h
 include/qt4/QtWebKit/qwebview.h
@@ -50,8 +63,8 @@ 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%%
+lib/qt4/libQtWebKit.so.4.9
+lib/qt4/libQtWebKit.so.4.9.0
 libdata/pkgconfig/QtWebKit.pc
 share/qt4/mkspecs/modules/qt_webkit_version.pri
 @dirrmtry share/qt4/mkspecs/modules