[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase qt5-qtbase: fix shared library plugin n...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7973e50574f0
branches:  trunk
changeset: 308928:7973e50574f0
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Jun 05 06:06:54 2018 +0000

description:
qt5-qtbase: fix shared library plugin naming on darwin

diffstat:

 x11/qt5-qtbase/Makefile                                         |   4 +-
 x11/qt5-qtbase/distinfo                                         |   4 +-
 x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf |  17 ----------
 x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf     |  15 ++++++++
 4 files changed, 19 insertions(+), 21 deletions(-)

diffs (73 lines):

diff -r dfc433982cf6 -r 7973e50574f0 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Mon Jun 04 23:54:59 2018 +0000
+++ b/x11/qt5-qtbase/Makefile   Tue Jun 05 06:06:54 2018 +0000
@@ -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"
diff -r dfc433982cf6 -r 7973e50574f0 x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo   Mon Jun 04 23:54:59 2018 +0000
+++ b/x11/qt5-qtbase/distinfo   Tue Jun 05 06:06:54 2018 +0000
@@ -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 @@
 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
diff -r dfc433982cf6 -r 7973e50574f0 x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf
--- a/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf   Mon Jun 04 23:54:59 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.3 2018/01/31 19:35:23 adam Exp $
-
-Fix for shared libraries naming on Darwin.
-
---- mkspecs/features/create_cmake.prf.orig     2015-10-13 04:35:32.000000000 +0000
-+++ mkspecs/features/create_cmake.prf
-@@ -213,8 +213,8 @@ mac {
-             CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
-             CMAKE_BUILD_IS_FRAMEWORK = "true"
-         } else {
--            CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib
--            CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib
-+            CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$${QT_MAJOR_VERSION}.dylib
-+            CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QT_MAJOR_VERSION}.dylib
-         }
-     }
- } else:win32 {
diff -r dfc433982cf6 -r 7973e50574f0 x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_toolchain.prf       Tue Jun 05 06:06:54 2018 +0000
@@ -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()