summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2018-11-10 19:33:47 +0000
committerbsiegert <bsiegert@pkgsrc.org>2018-11-10 19:33:47 +0000
commitbda7e9f742aed9d28a8f14a831af62d4e60aae17 (patch)
treeac914ea8aba7429d50917045ea707e071a2c8a3b
parent24c97bbd9b7fa503e49339ee0110782f28439343 (diff)
downloadpkgsrc-bda7e9f742aed9d28a8f14a831af62d4e60aae17.tar.gz
Add patch to fix qtdeclarative build.
The build apparently works only when qtdeclarative is already installed, because the qmltestrunner is missing the "quick" dependency. Patch from Hakan Engvall via pkgsrc-users, thanks a lot! Bump revision.
-rw-r--r--x11/qt5-qtdeclarative/Makefile3
-rw-r--r--x11/qt5-qtdeclarative/distinfo3
-rw-r--r--x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro13
3 files changed, 17 insertions, 2 deletions
diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile
index e8dad2a9614..17e4b3c59c0 100644
--- a/x11/qt5-qtdeclarative/Makefile
+++ b/x11/qt5-qtdeclarative/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2018/10/01 17:44:47 adam Exp $
+# $NetBSD: Makefile,v 1.34 2018/11/10 19:33:47 bsiegert Exp $
DISTNAME= qtdeclarative-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtdeclarative-${QTVERSION}
COMMENT= Qt5 module for declarative framework
+PKGREVISION= 1
BUILD_TARGET= sub-tools
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo
index c0b08f66df1..b4912f9a2dc 100644
--- a/x11/qt5-qtdeclarative/distinfo
+++ b/x11/qt5-qtdeclarative/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2018/10/01 17:44:47 adam Exp $
+$NetBSD: distinfo,v 1.12 2018/11/10 19:33:47 bsiegert Exp $
SHA1 (qtdeclarative-everywhere-src-5.11.2.tar.xz) = 51ca1331dc9bb1a1ad15ed4398ce358387cf22d6
RMD160 (qtdeclarative-everywhere-src-5.11.2.tar.xz) = 67be20bd74bfca77aa79520f1d55d3a749c269e1
@@ -9,3 +9,4 @@ SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a8
SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d
SHA1 (patch-src_3rdparty_masm_wtf_Compiler.h) = 8d7e318e0148eea0f262ec13463bc15bd03478dc
SHA1 (patch-src_qml_jsruntime_qv4alloca__p.h) = 1035da974789f897bb7071284fae21c979844f62
+SHA1 (patch-tools_qmltestrunner_qmltestrunner.pro) = eaf41fae8062e5809f9aadfbc2c456b42760a893
diff --git a/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro b/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro
new file mode 100644
index 00000000000..92c8eca99f1
--- /dev/null
+++ b/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_qmltestrunner_qmltestrunner.pro,v 1.1 2018/11/10 19:33:47 bsiegert Exp $
+
+Add missing dependency to fix build.
+--- tools/qmltestrunner/qmltestrunner.pro.orig 2018-09-11 11:45:18.000000000 +0000
++++ tools/qmltestrunner/qmltestrunner.pro
+@@ -1,6 +1,6 @@
+ SOURCES += main.cpp
+
+-QT += qml qmltest
++QT += qml qmltest quick
+ CONFIG += no_import_scan
+
+ QMAKE_TARGET_DESCRIPTION = QML Test Runner