CVS commit: pkgsrc/x11/qt5-qtbase

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Tue Jun  5 06:06:55 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-mkspecs_features_toolchain.prf
Removed Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-mkspecs_features_create__cmake.prf

Log Message:
qt5-qtbase: fix shared library plugin naming on darwin


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf

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-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.59 pkgsrc/x11/qt5-qtbase/Makefile:1.60
--- pkgsrc/x11/qt5-qtbase/Makefile:1.59 Fri May 18 15:29:29 2018
+++ pkgsrc/x11/qt5-qtbase/Makefile      Tue Jun  5 06:06:54 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2018/05/18 15:29:29 bacon Exp $
+# $NetBSD: Makefile,v 1.60 2018/06/05 06:06:54 dbj Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.40 pkgsrc/x11/qt5-qtbase/distinfo:1.41
--- pkgsrc/x11/qt5-qtbase/distinfo:1.40 Thu Apr 19 08:23:12 2018
+++ pkgsrc/x11/qt5-qtbase/distinfo      Tue Jun  5 06:06:54 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2018/04/19 08:23:12 jperkin Exp $
+$NetBSD: distinfo,v 1.41 2018/06/05 06:06:54 dbj Exp $
 
 SHA1 (qtbase-everywhere-src-5.10.1.tar.xz) = 234275f97ca401ae3df5e0c3d937e68056957bbe
 RMD160 (qtbase-everywhere-src-5.10.1.tar.xz) = b0587af8736bedc9b80ceb85f10ece64389a904c
@@ -6,8 +6,8 @@ SHA512 (qtbase-everywhere-src-5.10.1.tar
 Size (qtbase-everywhere-src-5.10.1.tar.xz) = 46024708 bytes
 SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = ffd0107d57e308aa83a780818756c9a538efc591
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
-SHA1 (patch-mkspecs_features_create__cmake.prf) = a28f711c27c412092a5414dfff3e941a0bbb1a25
 SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
+SHA1 (patch-mkspecs_features_toolchain.prf) = 80b3ce33d6ea1879101e96b489deaedc1522ea9a
 SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f
 SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = f0a4fdd304af2ee6c1b63022ccfcebd2640f0fcb

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf:1.1
--- /dev/null   Tue Jun  5 06:06:55 2018
+++ pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf  Tue Jun  5 06:06:55 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-mkspecs_features_toolchain.prf,v 1.1 2018/06/05 06:06:55 dbj Exp $
+
+Avoid "Variable QMAKE_CXX.COMPILER_MACROS is not defined" errors when using clang
+
+--- mkspecs/features/toolchain.prf.orig        2017-11-30 13:49:46.000000000 +0000
++++ mkspecs/features/toolchain.prf
+@@ -198,6 +198,8 @@ isEmpty($${target_prefix}.COMPILER_MACRO
+         }
+     } else: gcc {
+         vars = $$qtVariablesFromGCC($$QMAKE_CXX)
++    } else: clang {
++        vars = $$qtVariablesFromGCC($$QMAKE_CXX)
+     }
+     for (v, vars) {
+         contains(v, $${LITERAL_HASH}.*)|contains(v, " *"): next()