CVS commit: pkgsrc/x11/qt5-qtdeclarative

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Nov 10 19:33:48 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtdeclarative: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtdeclarative/patches:
            patch-tools_qmltestrunner_qmltestrunner.pro

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/qt5-qtdeclarative/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/qt5-qtdeclarative/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtdeclarative/Makefile
diff -u pkgsrc/x11/qt5-qtdeclarative/Makefile:1.33 pkgsrc/x11/qt5-qtdeclarative/Makefile:1.34
--- pkgsrc/x11/qt5-qtdeclarative/Makefile:1.33  Mon Oct  1 17:44:47 2018
+++ pkgsrc/x11/qt5-qtdeclarative/Makefile       Sat Nov 10 19:33:47 2018
@@ -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}

Index: pkgsrc/x11/qt5-qtdeclarative/distinfo
diff -u pkgsrc/x11/qt5-qtdeclarative/distinfo:1.11 pkgsrc/x11/qt5-qtdeclarative/distinfo:1.12
--- pkgsrc/x11/qt5-qtdeclarative/distinfo:1.11  Mon Oct  1 17:44:47 2018
+++ pkgsrc/x11/qt5-qtdeclarative/distinfo       Sat Nov 10 19:33:47 2018
@@ -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_
 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

Added files:

Index: pkgsrc/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro
diff -u /dev/null pkgsrc/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro:1.1
--- /dev/null   Sat Nov 10 19:33:48 2018
+++ pkgsrc/x11/qt5-qtdeclarative/patches/patch-tools_qmltestrunner_qmltestrunner.pro    Sat Nov 10 19:33:47 2018
@@ -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