CVS commit: pkgsrc/x11/qt5-qtbase

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 31 19:35:23 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtbase: distinfo
        pkgsrc/x11/qt5-qtbase/patches: patch-mkspecs_features_create__cmake.prf

Log Message:
qt5-qtbase: fix plug-in extension on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.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/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.37 pkgsrc/x11/qt5-qtbase/distinfo:1.38
--- pkgsrc/x11/qt5-qtbase/distinfo:1.37 Wed Jan 31 14:08:25 2018
+++ pkgsrc/x11/qt5-qtbase/distinfo      Wed Jan 31 19:35:23 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2018/01/31 14:08:25 adam Exp $
+$NetBSD: distinfo,v 1.38 2018/01/31 19:35:23 adam Exp $
 
 SHA1 (qtbase-everywhere-src-5.10.0.tar.xz) = 34fa3d4e7bb2b1545247a616190efaf74804db49
 RMD160 (qtbase-everywhere-src-5.10.0.tar.xz) = d6f9ab8526ebe50791b9b948930806dc8b3be73b
@@ -6,7 +6,7 @@ SHA512 (qtbase-everywhere-src-5.10.0.tar
 Size (qtbase-everywhere-src-5.10.0.tar.xz) = 45851596 bytes
 SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = ffd0107d57e308aa83a780818756c9a538efc591
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
-SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4
+SHA1 (patch-mkspecs_features_create__cmake.prf) = a28f711c27c412092a5414dfff3e941a0bbb1a25
 SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
 SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f
 SHA1 (patch-qmake_generators_makefile.cpp) = 26366f21108534a321d9d7c7f87066e9acf7d981

Index: pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf
diff -u pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf:1.2 pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf:1.3
--- pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf:1.2  Thu Oct 29 14:48:04 2015
+++ pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf      Wed Jan 31 19:35:23 2018
@@ -1,18 +1,9 @@
-$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.2 2015/10/29 14:48:04 adam Exp $
+$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
-@@ -147,7 +147,7 @@ contains(CONFIG, plugin) {
-         }
-     } else {
-         mac {
--            isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
-+            isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
-             else: CMAKE_PlUGIN_EXT = .a
- 
-             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
 @@ -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"