Wed Jan 17 19:56:18 2018 UTC ()
extra-cmake-modules: update tp 5.41.0

16 months worth of updates. requires qt5>=5.7


(markd)
diff -r1.6 -r1.7 pkgsrc/devel/extra-cmake-modules/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/extra-cmake-modules/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/extra-cmake-modules/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake
cvs diff -r1.6 -r1.7 pkgsrc/devel/extra-cmake-modules/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/Makefile 2016/08/21 21:12:42 1.6
+++ pkgsrc/devel/extra-cmake-modules/Makefile 2018/01/17 19:56:18 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2016/08/21 21:12:42 markd Exp $ 1# $NetBSD: Makefile,v 1.7 2018/01/17 19:56:18 markd Exp $
2 2
3DISTNAME= extra-cmake-modules-5.25.0 3DISTNAME= extra-cmake-modules-5.41.0
4CATEGORIES= devel kde 4CATEGORIES= devel kde
5MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/5.25/} 5MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/5.41/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
9HOMEPAGE= https://community.kde.org/Frameworks 9HOMEPAGE= https://community.kde.org/Frameworks
10COMMENT= Extra modules and scripts for CMake 10COMMENT= Extra modules and scripts for CMake
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13#BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2:../../textproc/py-sphinx 13#BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2:../../textproc/py-sphinx
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17CMAKE_ARG_PATH= .. 17CMAKE_ARG_PATH= ..
18CONFIGURE_DIRS= _KDE_build 18CONFIGURE_DIRS= _KDE_build
cvs diff -r1.2 -r1.3 pkgsrc/devel/extra-cmake-modules/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/PLIST 2016/02/14 04:13:32 1.2
+++ pkgsrc/devel/extra-cmake-modules/PLIST 2018/01/17 19:56:18 1.3
@@ -1,49 +1,70 @@ @@ -1,49 +1,70 @@
1@comment $NetBSD: PLIST,v 1.2 2016/02/14 04:13:32 markd Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:56:18 markd Exp $
2share/ECM/cmake/ECMConfig.cmake 2share/ECM/cmake/ECMConfig.cmake
3share/ECM/cmake/ECMConfigVersion.cmake 3share/ECM/cmake/ECMConfigVersion.cmake
4share/ECM/find-modules/ECMFindModuleHelpersStub.cmake 4share/ECM/find-modules/ECMFindModuleHelpersStub.cmake
5share/ECM/find-modules/FindEGL.cmake 5share/ECM/find-modules/FindEGL.cmake
 6share/ECM/find-modules/FindGLIB2.cmake
 7share/ECM/find-modules/FindGperf.cmake
 8share/ECM/find-modules/FindInotify.cmake
6share/ECM/find-modules/FindKF5.cmake 9share/ECM/find-modules/FindKF5.cmake
7share/ECM/find-modules/FindLibGit2.cmake 10share/ECM/find-modules/FindLibGit2.cmake
8share/ECM/find-modules/FindOpenEXR.cmake 11share/ECM/find-modules/FindOpenEXR.cmake
9share/ECM/find-modules/FindPng2Ico.cmake 12share/ECM/find-modules/FindPng2Ico.cmake
10share/ECM/find-modules/FindPoppler.cmake 13share/ECM/find-modules/FindPoppler.cmake
 14share/ECM/find-modules/FindPulseAudio.cmake
 15share/ECM/find-modules/FindPythonModuleGeneration.cmake
 16share/ECM/find-modules/FindQHelpGenerator.cmake
11share/ECM/find-modules/FindQtWaylandScanner.cmake 17share/ECM/find-modules/FindQtWaylandScanner.cmake
 18share/ECM/find-modules/FindSasl2.cmake
12share/ECM/find-modules/FindSharedMimeInfo.cmake 19share/ECM/find-modules/FindSharedMimeInfo.cmake
13share/ECM/find-modules/FindWayland.cmake 20share/ECM/find-modules/FindWayland.cmake
14share/ECM/find-modules/FindWaylandScanner.cmake 21share/ECM/find-modules/FindWaylandScanner.cmake
15share/ECM/find-modules/FindX11_XCB.cmake 22share/ECM/find-modules/FindX11_XCB.cmake
16share/ECM/find-modules/FindXCB.cmake 23share/ECM/find-modules/FindXCB.cmake
 24share/ECM/find-modules/GeneratePythonBindingUmbrellaModule.cmake
 25share/ECM/find-modules/Qt5Ruleset.py
 26share/ECM/find-modules/rules_engine.py
 27share/ECM/find-modules/run-sip.py
 28share/ECM/find-modules/sip_generator.py
17share/ECM/kde-modules/KDECMakeSettings.cmake 29share/ECM/kde-modules/KDECMakeSettings.cmake
18share/ECM/kde-modules/KDECompilerSettings.cmake 30share/ECM/kde-modules/KDECompilerSettings.cmake
19share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake 31share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake
20share/ECM/kde-modules/KDEInstallDirs.cmake 32share/ECM/kde-modules/KDEInstallDirs.cmake
21share/ECM/kde-modules/KDEPackageAppTemplates.cmake 33share/ECM/kde-modules/KDEPackageAppTemplates.cmake
 34share/ECM/kde-modules/appstreamtest.cmake
22share/ECM/modules/ECMAddAppIcon.cmake 35share/ECM/modules/ECMAddAppIcon.cmake
 36share/ECM/modules/ECMAddQch.cmake
23share/ECM/modules/ECMAddTests.cmake 37share/ECM/modules/ECMAddTests.cmake
24share/ECM/modules/ECMCoverageOption.cmake 38share/ECM/modules/ECMCoverageOption.cmake
25share/ECM/modules/ECMCreateQmFromPoFiles.cmake 39share/ECM/modules/ECMCreateQmFromPoFiles.cmake
26share/ECM/modules/ECMEnableSanitizers.cmake 40share/ECM/modules/ECMEnableSanitizers.cmake
27share/ECM/modules/ECMFindModuleHelpers.cmake 41share/ECM/modules/ECMFindModuleHelpers.cmake
 42share/ECM/modules/ECMFindQMLModule.cmake.in
28share/ECM/modules/ECMGenerateHeaders.cmake 43share/ECM/modules/ECMGenerateHeaders.cmake
29share/ECM/modules/ECMGeneratePkgConfigFile.cmake 44share/ECM/modules/ECMGeneratePkgConfigFile.cmake
30share/ECM/modules/ECMGeneratePriFile.cmake 45share/ECM/modules/ECMGeneratePriFile.cmake
 46share/ECM/modules/ECMGenerateQmlTypes.cmake
31share/ECM/modules/ECMInstallIcons.cmake 47share/ECM/modules/ECMInstallIcons.cmake
32share/ECM/modules/ECMMarkAsTest.cmake 48share/ECM/modules/ECMMarkAsTest.cmake
33share/ECM/modules/ECMMarkNonGuiExecutable.cmake 49share/ECM/modules/ECMMarkNonGuiExecutable.cmake
34share/ECM/modules/ECMOptionalAddSubdirectory.cmake 50share/ECM/modules/ECMOptionalAddSubdirectory.cmake
35share/ECM/modules/ECMPackageConfigHelpers.cmake 51share/ECM/modules/ECMPackageConfigHelpers.cmake
36share/ECM/modules/ECMPoQmTools.cmake 52share/ECM/modules/ECMPoQmTools.cmake
 53share/ECM/modules/ECMQMLModules.cmake
 54share/ECM/modules/ECMQchDoxygen.config.in
 55share/ECM/modules/ECMQchDoxygenLayout.xml
37share/ECM/modules/ECMQmLoader.cpp.in 56share/ECM/modules/ECMQmLoader.cpp.in
38share/ECM/modules/ECMQtDeclareLoggingCategory.cmake 57share/ECM/modules/ECMQtDeclareLoggingCategory.cmake
39share/ECM/modules/ECMQtDeclareLoggingCategory.cpp.in 58share/ECM/modules/ECMQtDeclareLoggingCategory.cpp.in
40share/ECM/modules/ECMQtDeclareLoggingCategory.h.in 59share/ECM/modules/ECMQtDeclareLoggingCategory.h.in
41share/ECM/modules/ECMQueryQmake.cmake 60share/ECM/modules/ECMQueryQmake.cmake
42share/ECM/modules/ECMSetupVersion.cmake 61share/ECM/modules/ECMSetupVersion.cmake
43share/ECM/modules/ECMUninstallTarget.cmake 62share/ECM/modules/ECMUninstallTarget.cmake
44share/ECM/modules/ECMUseFindModules.cmake 63share/ECM/modules/ECMUseFindModules.cmake
45share/ECM/modules/ECMVersionHeader.h.in 64share/ECM/modules/ECMVersionHeader.h.in
 65share/ECM/modules/ECMWinResolveSymlinks.cmake
46share/ECM/modules/ecm_uninstall.cmake.in 66share/ECM/modules/ecm_uninstall.cmake.in
 67share/ECM/test-modules/test_execute_and_compare.cmake
47share/ECM/toolchain/Android.cmake 68share/ECM/toolchain/Android.cmake
48share/ECM/toolchain/deployment-file.json.in 69share/ECM/toolchain/deployment-file.json.in
49share/ECM/toolchain/specifydependencies.cmake 70share/ECM/toolchain/specifydependencies.cmake
cvs diff -r1.5 -r1.6 pkgsrc/devel/extra-cmake-modules/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/distinfo 2016/08/21 21:12:42 1.5
+++ pkgsrc/devel/extra-cmake-modules/distinfo 2018/01/17 19:56:18 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2016/08/21 21:12:42 markd Exp $ 1$NetBSD: distinfo,v 1.6 2018/01/17 19:56:18 markd Exp $
2 2
3SHA1 (extra-cmake-modules-5.25.0.tar.xz) = 199d85a51ee945b3910000e8920abec0187ab18a 3SHA1 (extra-cmake-modules-5.41.0.tar.xz) = ef5c552af9212ee7e0a563b8407f5daf9d2d808e
4RMD160 (extra-cmake-modules-5.25.0.tar.xz) = ec5131315aa6fbf07371eeeda9356e91b540b2d4 4RMD160 (extra-cmake-modules-5.41.0.tar.xz) = 7b9e173b69f6823dd1616ee415ffb74f55d71ec7
5SHA512 (extra-cmake-modules-5.25.0.tar.xz) = 8bfcaffe72278674054052dd68cf5b1ef844a90c02b3e89e1106298640530511933c7aa9f524ef83727643359715fd39fc6fff49d5ca4a47e6fb92a4034dddff 5SHA512 (extra-cmake-modules-5.41.0.tar.xz) = 034c67ed56ee4f6002ff2f0bfca2d7eb7877180b5aa5cf5eb3babb6e40c0669eb0728f45832bd8250ff304647f9a6555233bff4fdf6eccc9b14b420f4b1c3924
6Size (extra-cmake-modules-5.25.0.tar.xz) = 285904 bytes 6Size (extra-cmake-modules-5.41.0.tar.xz) = 313940 bytes
7SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 18ece25450c12a63c05b4604f27e9f90d71163a9 7SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 0d0c33df8d3207841d48ad2dc51ebe1533866ca1
cvs diff -r1.1 -r1.2 pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake 2016/06/07 17:54:59 1.1
+++ pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake 2018/01/17 19:56:18 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-kde-modules_KDECompilerSettings.cmake,v 1.1 2016/06/07 17:54:59 joerg Exp $ 1$NetBSD: patch-kde-modules_KDECompilerSettings.cmake,v 1.2 2018/01/17 19:56:18 markd Exp $
2 2
3Do not hard-code --enable-new-dtags. It is completely broken on systems like 3Do not hard-code --enable-new-dtags. It is completely broken on systems like
4NetBSD implementing the sane rpath semantic and just have a new enough binutils 4NetBSD implementing the sane rpath semantic and just have a new enough binutils
5version. It is up to the system compiler to know what the correct platfor 5version. It is up to the system compiler to know what the correct platfor
6choice is. 6choice is.
7 7
8--- kde-modules/KDECompilerSettings.cmake.orig 2016-06-05 23:16:56.900586724 +0000 8--- kde-modules/KDECompilerSettings.cmake.orig 2017-11-30 07:42:14.000000000 +0000
9+++ kde-modules/KDECompilerSettings.cmake 9+++ kde-modules/KDECompilerSettings.cmake
10@@ -208,14 +208,6 @@ if (POLICY CMP0063) 10@@ -229,14 +229,6 @@ if (POLICY CMP0063)
11 cmake_policy(SET CMP0063 NEW) 11 cmake_policy(SET CMP0063 NEW)
12 endif() 12 endif()
13  13
14-if (UNIX AND NOT APPLE) 14-if (UNIX AND NOT APPLE AND NOT CYGWIN)
15- # Enable adding DT_RUNPATH, which means that LD_LIBRARY_PATH takes precedence 15- # Enable adding DT_RUNPATH, which means that LD_LIBRARY_PATH takes precedence
16- # over the built-in rPath 16- # over the built-in rPath
17- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") 17- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
18- set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") 18- set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
19- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_EXE_LINKER_FLAGS}") 19- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_EXE_LINKER_FLAGS}")
20-endif() 20-endif()
21- 21-
22 if (CMAKE_SYSTEM_NAME STREQUAL GNU) 22 if (CMAKE_SYSTEM_NAME STREQUAL GNU)
23 # Enable multithreading with the pthread library 23 # Enable multithreading with the pthread library
24 # FIXME: Is this actually necessary to have here? 24 # FIXME: Is this actually necessary to have here?