Changes 5.4.0:

Chromium-based browser engine Qt WebEngine
Qt WebView for showing web content using the native OS web engine on mobile
Full support on Qt for Windows Store Apps, including WinRT and Windows Phone 8.1
Improved Compliance with iOS 8 and Xcode 6
Improved OS X 10.10 ‘Yosemite’ support and new Mac AppStore signing
High-DPI support for Windows and OS X
Dynamic GL switching between OpenGL and ANGLE on Windows
Mix OpenGL and Qt Quick with QOpenGLWidget
Android Look-and-Feel for Qt Quick Controls
Qt Creator 3.3 with new Qt Quick Designer
Bluetooth now supports BlueZ5 with tech preview on Bluetooth LE

6 files changed, 89 insertions, 12 deletions

diff --git a/x11/qt5-qtscript/Makefile b/x11/qt5-qtscript/Makefile
index 845aa71f369..6a893284a54 100644
--- a/x11/qt5-qtscript/Makefile
+++ b/x11/qt5-qtscript/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/12/25 13:51:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/30 17:23:47 adam Exp $
 
+DISTNAME=	qtscript-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtscript-${QTVERSION}
 COMMENT=	Qt5 module for script
 
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
-
-BUILD_DIRS=		qtscript
 BUILD_TARGET=		sub-src
 MAKE_ENV+=		QTDIR=${QTDIR}
 
@@ -17,9 +14,8 @@ INSTALLATION_DIRS+=	lib/pkgconfig
 
 post-install:
 .for i in Qt5Script.pc Qt5ScriptTools.pc
-	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
-		cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
-		ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
+	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
+	ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
 .include "../../x11/qt5-qttools/buildlink3.mk"
diff --git a/x11/qt5-qtscript/buildlink3.mk b/x11/qt5-qtscript/buildlink3.mk
index f50a611f24e..9cc05421420 100644
--- a/x11/qt5-qtscript/buildlink3.mk
+++ b/x11/qt5-qtscript/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2014/12/30 17:23:47 adam Exp $
 
 BUILDLINK_TREE+=	qt5-qtscript
 
 .if !defined(QT5_QTSCRIPT_BUILDLINK3_MK)
 QT5_QTSCRIPT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qtscript+=	qt5-qtscript>=5.2.0
-BUILDLINK_ABI_DEPENDS.qt5-qtscript?=	qt5-qtscript>=5.2.1
+BUILDLINK_API_DEPENDS.qt5-qtscript+=	qt5-qtscript>=5.4.0
+BUILDLINK_ABI_DEPENDS.qt5-qtscript+=	qt5-qtscript>=5.4.0
 BUILDLINK_PKGSRCDIR.qt5-qtscript?=	../../x11/qt5-qtscript
 
 BUILDLINK_INCDIRS.qt5-qtscript+=	qt5/include
 BUILDLINK_LIBDIRS.qt5-qtscript+=	qt5/lib
 BUILDLINK_LIBDIRS.qt5-qtscript+=	qt5/plugins
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .endif	# QT5_QTSCRIPT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-qt5-qtscript
diff --git a/x11/qt5-qtscript/distinfo b/x11/qt5-qtscript/distinfo
new file mode 100644
index 00000000000..6dd536deb70
--- /dev/null
+++ b/x11/qt5-qtscript/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $
+
+SHA1 (qtscript-opensource-src-5.4.0.tar.xz) = 7ca8d6ccbc97fb24a9e76b69eeaa5e7e9c321955
+RMD160 (qtscript-opensource-src-5.4.0.tar.xz) = c51fd51c5f3ada72fdd5397ed5fb71d209ecf3a4
+Size (qtscript-opensource-src-5.4.0.tar.xz) = 2579768 bytes
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h) = c8044ceaab87091aba1f226e03afa681abad11b0
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = 6672e941f0ecbba35b5b932ab9f7b49a269fb6e6
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = 5467afc8dc5e2f93a267a6ab380bb647c501d145
diff --git a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h
new file mode 100644
index 00000000000..402c804f145
--- /dev/null
+++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h,v 1.1 2014/12/30 17:23:47 adam Exp $
+
+* Add DragonFly support
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig	2013-11-27 01:00:27.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/config.h
+@@ -53,7 +53,7 @@
+ 
+ #endif
+ 
+-#if OS(FREEBSD) || OS(OPENBSD)
++#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY)
+ #define HAVE_PTHREAD_NP_H 1
+ #endif
+ 
diff --git a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h
new file mode 100644
index 00000000000..bc22d162fbe
--- /dev/null
+++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h,v 1.1 2014/12/30 17:23:47 adam Exp $
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	2013-11-27 01:00:27.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
+@@ -491,7 +491,7 @@ namespace JSC {
+             u.asBits.tag = CellTag;
+         else
+             u.asBits.tag = EmptyValueTag;
+-        u.asBits.payload = reinterpret_cast<int32_t>(ptr);
++        u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
+@@ -503,7 +503,7 @@ namespace JSC {
+             u.asBits.tag = CellTag;
+         else
+             u.asBits.tag = EmptyValueTag;
+-        u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
++        u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
diff --git a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
new file mode 100644
index 00000000000..79376a65d74
--- /dev/null
+++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h,v 1.1 2014/12/30 17:23:47 adam Exp $
+
+* Add NetBSD support
+* Add DragonFly support
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2013-11-27 01:00:28.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -419,7 +419,7 @@
+ 
+ /* OS(NETBSD) - NetBSD */
+ #if defined(__NetBSD__)
+-#define WTF_PLATFORM_NETBSD 1
++#define WTF_OS_NETBSD 1
+ #endif
+ 
+ /* OS(OPENBSD) - OpenBSD */
+@@ -427,6 +427,11 @@
+ #define WTF_OS_OPENBSD 1
+ #endif
+ 
++/* OS(DRAGONFLY) - DragonFly */
++#ifdef __DragonFly__
++#define WTF_OS_DRAGONFLY 1
++#endif
++
+ /* OS(QNX) - QNX */
+ #if defined(__QNXNTO__)
+ #define WTF_OS_QNX 1
+@@ -465,6 +470,7 @@
+     || OS(LINUX)            \
+     || OS(NETBSD)           \
+     || OS(OPENBSD)          \
++    || OS(DRAGONFLY)        \
+     || OS(QNX)              \
+     || OS(SOLARIS)          \
+     || OS(SYMBIAN)          \