Mon Apr 25 03:04:59 2022 UTC ()
extra-cmake-modules: update to 5.93.0

5.84.0:
Make pre-commit hook executable
[fastlane] Add mapping for serbian
Set the C++17 standard starting from 5.84
Bump the C++ standard we compile with to 17
Override atime and ctime in tar PaxHeaders
Add prefix.sh.fish file for fish shell

5.85.0
[ecmcheckoutboundlicense] Ensure that last source file is always processed
Handle case where zero must be kept
ecm_setup_version: deal with 0-prefixed version values in PROJECT mode
modules/ECMGenerateHeaders.cmake - avoid uninitialized warning
suppress tar errors
FindGperf: support version check
Define NOMINMAX on Windows
KDECompilerSettings: properly use KDE_QT_MODERNCODE_DEFINITIONS_LEVEL
Add Find7z & Findgzip
Don't install logging categories files on Android
Handle case where ECM_GLOBAL_FIND_VERSION is undefined
Enable the usage of -Bsymbolic-functions
KDECompilerSettings: add KDE_COMPILERSETTINGS_LEVEL & more settings

5.86.0
ECMSetupQtPluginMacroNames: avoid adding duplicates to vars in config code
Enable KDEGitCommitHooks on Windows

5.87.0
Add -Werror=init-self to the default CMAKE_CXX_FLAGS
Handle git remotes that aren't called origin in _repository_name()
python: Bump maximum version for Python 3 module generator check
Avoid raising an error for submodule git trees
Make sphinx happier about syntax

5.88.0
Fix Wayland_DATADIR when cross-compiling
[android] Extend NDK workaround to version 22
msvc: Fix __cplusplus value
Fix ECM on systems without PyQt5 on Python 2
ECMFindQMLModule: Use QT_HOST_BINS to find qmlplugindump
FindQtWaylandScanner: Use QT_HOST_BINS to find qtwaylandscanner
ecm_add_test: add -DQT_FORCE_ASSERTS to compile flags by default

5.89.0
Include QtVersionOption before all Qt5 find_package calls
ECMGeneratePkgConfigFile: Add an URL parameter
KDEInstallDirs5: set up KSERVICESDIR alias for KSERVICES5DIR
KDEInstallDirs6: comment out call to query_qmake, not defined
KDEInstallDirs6: don't set deprecated variable names anymore
PLUGINDIR is based upon QTPLUGINDIR, so only define it after QTPLUGINDIR
Split KDEInstallDirs into a 5 and a 6 variant
AddAppIcon: clarify ksvg2icns role for @2x icons
Add support for specifying private dependencies for pkg-config files
FindEGL add 'lib' prefix for windows

5.90.0
Add support for finding Poppler's Qt6 library
Add support for finding Qt6 QML modules
Add missing prefix to version-less install directory aliases
FindInotify.cmake: add target support
Define version-less install targets in KDEInstallDirs5.cmake

5.91.0
kde_package_app_templates: drop atime,ctime, consistently set mtime
kde_package_app_templates: use numeric owner/group with tar
Set the right @since version for ECMQmlModule
Only enable -bsymbolic-functions when Qt is built in a compatible way
Introduce ECMFindQmlModule.cmake
Add ecm_set_deprecation_versions cmake function

5.92.0
[ECMQmlModule] Fix doc syntax
ECMGeneratePriFile: support multiple include install dirs
KDEInstallDirs6: replace ECMQueryQMake usage with qtpaths
Adapt Android toolchain file and FindGradle to Qt6

5.93.0
Fix finding qmake
ECMQueryQt: don't fail when TRY is used
ECMQueryQt: Add fallbacks
ECMAddQch: Make it work with Qt6::qhelpgenerator too
Deprecate ECMQueryQmake, superseded by ECMQueryQt
KDEInstallDirs6: port from custom logic to ecm_query_qt
Port from ECMQueryQmake to ECMQueryQt
Android: use the current cmake executable
Add ECMQueryQt module, which encompases both Qt5 Qmake and Qt6 qtpaths
generate-fastlane-metadata: Don't fail if source URL can not be found
Fix checking the repository name for detached remotes
Android: Set CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
Check that you're building the framework in a supported platform


(markd)
diff -r1.19 -r1.20 pkgsrc/devel/extra-cmake-modules/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/extra-cmake-modules/PLIST
diff -r1.20 -r1.21 pkgsrc/devel/extra-cmake-modules/distinfo
diff -r0 -r1.1 pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDEMetaInfoPlatformCheck.cmake

cvs diff -r1.19 -r1.20 pkgsrc/devel/extra-cmake-modules/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/Makefile 2022/01/28 09:00:36 1.19
+++ pkgsrc/devel/extra-cmake-modules/Makefile 2022/04/25 03:04:59 1.20
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.19 2022/01/28 09:00:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2022/04/25 03:04:59 markd Exp $
2 2
3DISTNAME= extra-cmake-modules-5.83.0 3DISTNAME= extra-cmake-modules-5.93.0
4CATEGORIES= devel kde 4CATEGORIES= devel kde
5MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/${PKGVERSION_NOREV:R}/}
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
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15CMAKE_ARG_PATH= .. 15CMAKE_ARG_PATH= ..
16CONFIGURE_DIRS= _KDE_build 16CONFIGURE_DIRS= _KDE_build

cvs diff -r1.10 -r1.11 pkgsrc/devel/extra-cmake-modules/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/PLIST 2022/01/28 09:00:36 1.10
+++ pkgsrc/devel/extra-cmake-modules/PLIST 2022/04/25 03:04:59 1.11
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1@comment $NetBSD: PLIST,v 1.10 2022/01/28 09:00:36 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.11 2022/04/25 03:04:59 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/Find7z.cmake
5share/ECM/find-modules/FindCanberra.cmake 6share/ECM/find-modules/FindCanberra.cmake
6share/ECM/find-modules/FindEGL.cmake 7share/ECM/find-modules/FindEGL.cmake
7share/ECM/find-modules/FindGLIB2.cmake 8share/ECM/find-modules/FindGLIB2.cmake
8share/ECM/find-modules/FindGperf.cmake 9share/ECM/find-modules/FindGperf.cmake
9share/ECM/find-modules/FindGradle.cmake 10share/ECM/find-modules/FindGradle.cmake
10share/ECM/find-modules/FindIcoTool.cmake 11share/ECM/find-modules/FindIcoTool.cmake
11share/ECM/find-modules/FindInotify.cmake 12share/ECM/find-modules/FindInotify.cmake
12share/ECM/find-modules/FindIsoCodes.cmake 13share/ECM/find-modules/FindIsoCodes.cmake
13share/ECM/find-modules/FindKF5.cmake 14share/ECM/find-modules/FindKF5.cmake
14share/ECM/find-modules/FindLibExiv2.cmake 15share/ECM/find-modules/FindLibExiv2.cmake
15share/ECM/find-modules/FindLibGit2.cmake 16share/ECM/find-modules/FindLibGit2.cmake
16share/ECM/find-modules/FindLibMount.cmake 17share/ECM/find-modules/FindLibMount.cmake
17share/ECM/find-modules/FindLibcap.cmake 18share/ECM/find-modules/FindLibcap.cmake
@@ -24,81 +25,98 @@ share/ECM/find-modules/FindQHelpGenerato @@ -24,81 +25,98 @@ share/ECM/find-modules/FindQHelpGenerato
24share/ECM/find-modules/FindQtWaylandScanner.cmake 25share/ECM/find-modules/FindQtWaylandScanner.cmake
25share/ECM/find-modules/FindReuseTool.cmake 26share/ECM/find-modules/FindReuseTool.cmake
26share/ECM/find-modules/FindSasl2.cmake 27share/ECM/find-modules/FindSasl2.cmake
27share/ECM/find-modules/FindSeccomp.cmake 28share/ECM/find-modules/FindSeccomp.cmake
28share/ECM/find-modules/FindSharedMimeInfo.cmake 29share/ECM/find-modules/FindSharedMimeInfo.cmake
29share/ECM/find-modules/FindTaglib.cmake 30share/ECM/find-modules/FindTaglib.cmake
30share/ECM/find-modules/FindUDev.cmake 31share/ECM/find-modules/FindUDev.cmake
31share/ECM/find-modules/FindWayland.cmake 32share/ECM/find-modules/FindWayland.cmake
32share/ECM/find-modules/FindWaylandProtocols.cmake 33share/ECM/find-modules/FindWaylandProtocols.cmake
33share/ECM/find-modules/FindWaylandScanner.cmake 34share/ECM/find-modules/FindWaylandScanner.cmake
34share/ECM/find-modules/FindX11_XCB.cmake 35share/ECM/find-modules/FindX11_XCB.cmake
35share/ECM/find-modules/FindXCB.cmake 36share/ECM/find-modules/FindXCB.cmake
36share/ECM/find-modules/Findepoxy.cmake 37share/ECM/find-modules/Findepoxy.cmake
 38share/ECM/find-modules/Findgzip.cmake
37share/ECM/find-modules/GeneratePythonBindingUmbrellaModule.cmake 39share/ECM/find-modules/GeneratePythonBindingUmbrellaModule.cmake
38share/ECM/find-modules/Qt5Ruleset.py 40share/ECM/find-modules/Qt5Ruleset.py
39share/ECM/find-modules/local.properties.cmake 41share/ECM/find-modules/local.properties.cmake
40share/ECM/find-modules/rules_engine.py 42share/ECM/find-modules/rules_engine.py
41share/ECM/find-modules/run-sip.py 43share/ECM/find-modules/run-sip.py
42share/ECM/find-modules/settings.gradle.cmake 44share/ECM/find-modules/settings.gradle.cmake
43share/ECM/find-modules/sip_generator.py 45share/ECM/find-modules/sip_generator.py
44share/ECM/kde-modules/KDECMakeSettings.cmake 46share/ECM/kde-modules/KDECMakeSettings.cmake
45share/ECM/kde-modules/KDEClangFormat.cmake 47share/ECM/kde-modules/KDEClangFormat.cmake
46share/ECM/kde-modules/KDECompilerSettings.cmake 48share/ECM/kde-modules/KDECompilerSettings.cmake
 49share/ECM/kde-modules/KDEFrameworkCompilerLegacySettings.cmake
47share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake 50share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake
48share/ECM/kde-modules/KDEGitCommitHooks.cmake 51share/ECM/kde-modules/KDEGitCommitHooks.cmake
49share/ECM/kde-modules/KDEInstallDirs.cmake 52share/ECM/kde-modules/KDEInstallDirs.cmake
 53share/ECM/kde-modules/KDEInstallDirs5.cmake
 54share/ECM/kde-modules/KDEInstallDirs6.cmake
 55share/ECM/kde-modules/KDEInstallDirsCommon.cmake
 56share/ECM/kde-modules/KDEMetaInfoPlatformCheck.cmake
50share/ECM/kde-modules/KDEPackageAppTemplates.cmake 57share/ECM/kde-modules/KDEPackageAppTemplates.cmake
 58share/ECM/kde-modules/KDESetupPrefixScript.cmake
51share/ECM/kde-modules/appstreamtest.cmake 59share/ECM/kde-modules/appstreamtest.cmake
52share/ECM/kde-modules/clang-format.cmake 60share/ECM/kde-modules/clang-format.cmake
53share/ECM/kde-modules/kde-git-commit-hooks/clang-format.sh 61share/ECM/kde-modules/kde-git-commit-hooks/clang-format.sh
54share/ECM/kde-modules/kde-git-commit-hooks/pre-commit.in 62share/ECM/kde-modules/kde-git-commit-hooks/pre-commit.in
55share/ECM/kde-modules/prefix.sh.cmake 63share/ECM/kde-modules/prefix.sh.cmake
 64share/ECM/kde-modules/prefix.sh.fish.cmake
56share/ECM/modules/CheckAtomic.cmake 65share/ECM/modules/CheckAtomic.cmake
57share/ECM/modules/ECMAddAppIcon.cmake 66share/ECM/modules/ECMAddAppIcon.cmake
58share/ECM/modules/ECMAddQch.cmake 67share/ECM/modules/ECMAddQch.cmake
59share/ECM/modules/ECMAddQtDesignerPlugin.cmake 68share/ECM/modules/ECMAddQtDesignerPlugin.cmake
60share/ECM/modules/ECMAddTests.cmake 69share/ECM/modules/ECMAddTests.cmake
61share/ECM/modules/ECMCheckOutboundLicense.cmake 70share/ECM/modules/ECMCheckOutboundLicense.cmake
62share/ECM/modules/ECMConfiguredInstall.cmake 71share/ECM/modules/ECMConfiguredInstall.cmake
63share/ECM/modules/ECMCoverageOption.cmake 72share/ECM/modules/ECMCoverageOption.cmake
64share/ECM/modules/ECMCreateQmFromPoFiles.cmake 73share/ECM/modules/ECMCreateQmFromPoFiles.cmake
 74share/ECM/modules/ECMDeprecationSettings.cmake
65share/ECM/modules/ECMEnableSanitizers.cmake 75share/ECM/modules/ECMEnableSanitizers.cmake
66share/ECM/modules/ECMFindModuleHelpers.cmake 76share/ECM/modules/ECMFindModuleHelpers.cmake
67share/ECM/modules/ECMFindQMLModule.cmake.in 77share/ECM/modules/ECMFindQmlModule.cmake
 78share/ECM/modules/ECMFindQmlModule.cmake.in
68share/ECM/modules/ECMGenerateDBusServiceFile.cmake 79share/ECM/modules/ECMGenerateDBusServiceFile.cmake
69share/ECM/modules/ECMGenerateExportHeader.cmake 80share/ECM/modules/ECMGenerateExportHeader.cmake
70share/ECM/modules/ECMGenerateHeaders.cmake 81share/ECM/modules/ECMGenerateHeaders.cmake
71share/ECM/modules/ECMGeneratePkgConfigFile.cmake 82share/ECM/modules/ECMGeneratePkgConfigFile.cmake
72share/ECM/modules/ECMGeneratePriFile.cmake 83share/ECM/modules/ECMGeneratePriFile.cmake
73share/ECM/modules/ECMGenerateQmlTypes.cmake 84share/ECM/modules/ECMGenerateQmlTypes.cmake
74share/ECM/modules/ECMInstallIcons.cmake 85share/ECM/modules/ECMInstallIcons.cmake
75share/ECM/modules/ECMMarkAsTest.cmake 86share/ECM/modules/ECMMarkAsTest.cmake
76share/ECM/modules/ECMMarkNonGuiExecutable.cmake 87share/ECM/modules/ECMMarkNonGuiExecutable.cmake
77share/ECM/modules/ECMOptionalAddSubdirectory.cmake 88share/ECM/modules/ECMOptionalAddSubdirectory.cmake
78share/ECM/modules/ECMPackageConfigHelpers.cmake 89share/ECM/modules/ECMPackageConfigHelpers.cmake
79share/ECM/modules/ECMPoQmTools.cmake 90share/ECM/modules/ECMPoQmTools.cmake
80share/ECM/modules/ECMQMLModules.cmake 91share/ECM/modules/ECMQMLModules.cmake
81share/ECM/modules/ECMQchDoxygen.config.in 92share/ECM/modules/ECMQchDoxygen.config.in
82share/ECM/modules/ECMQchDoxygenLayout.xml 93share/ECM/modules/ECMQchDoxygenLayout.xml
83share/ECM/modules/ECMQmLoader.cpp.in 94share/ECM/modules/ECMQmLoader.cpp.in
 95share/ECM/modules/ECMQmlModule.cmake
 96share/ECM/modules/ECMQmlModule.cpp.in
 97share/ECM/modules/ECMQmlModule.cpp.in.license
 98share/ECM/modules/ECMQmlModule.h.in
 99share/ECM/modules/ECMQmlModule.h.in.license
84share/ECM/modules/ECMQtDeclareLoggingCategory.cmake 100share/ECM/modules/ECMQtDeclareLoggingCategory.cmake
85share/ECM/modules/ECMQtDeclareLoggingCategory.cpp.in 101share/ECM/modules/ECMQtDeclareLoggingCategory.cpp.in
86share/ECM/modules/ECMQtDeclareLoggingCategory.h.in 102share/ECM/modules/ECMQtDeclareLoggingCategory.h.in
87share/ECM/modules/ECMQueryQmake.cmake 103share/ECM/modules/ECMQueryQmake.cmake
 104share/ECM/modules/ECMQueryQt.cmake
88share/ECM/modules/ECMSetupQtPluginMacroNames.cmake 105share/ECM/modules/ECMSetupQtPluginMacroNames.cmake
89share/ECM/modules/ECMSetupVersion.cmake 106share/ECM/modules/ECMSetupVersion.cmake
90share/ECM/modules/ECMSourceVersionControl.cmake 107share/ECM/modules/ECMSourceVersionControl.cmake
91share/ECM/modules/ECMUninstallTarget.cmake 108share/ECM/modules/ECMUninstallTarget.cmake
92share/ECM/modules/ECMUseFindModules.cmake 109share/ECM/modules/ECMUseFindModules.cmake
93share/ECM/modules/ECMVersionHeader.h.in 110share/ECM/modules/ECMVersionHeader.h.in
94share/ECM/modules/ECMWinResolveSymlinks.cmake 111share/ECM/modules/ECMWinResolveSymlinks.cmake
 112share/ECM/modules/QtVersionOption.cmake
95share/ECM/modules/check-outbound-license.py 113share/ECM/modules/check-outbound-license.py
96share/ECM/modules/ecm_uninstall.cmake.in 114share/ECM/modules/ecm_uninstall.cmake.in
97share/ECM/test-modules/test_execute_and_compare.cmake 115share/ECM/test-modules/test_execute_and_compare.cmake
98share/ECM/toolchain/Android.cmake 116share/ECM/toolchain/Android.cmake
99share/ECM/toolchain/ECMAndroidDeployQt.cmake 117share/ECM/toolchain/ECMAndroidDeployQt.cmake
100share/ECM/toolchain/deployment-file-qt514.json.in 118share/ECM/toolchain/deployment-file-qt514.json.in
101share/ECM/toolchain/deployment-file.json.in 119share/ECM/toolchain/deployment-file.json.in
102share/ECM/toolchain/generate-fastlane-metadata.py 120share/ECM/toolchain/generate-fastlane-metadata.py
103share/ECM/toolchain/hasMainSymbol.cmake 121share/ECM/toolchain/hasMainSymbol.cmake
104share/ECM/toolchain/specifydependencies.cmake 122share/ECM/toolchain/specifydependencies.cmake

cvs diff -r1.20 -r1.21 pkgsrc/devel/extra-cmake-modules/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/distinfo 2022/01/28 09:00:36 1.20
+++ pkgsrc/devel/extra-cmake-modules/distinfo 2022/04/25 03:04:59 1.21
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.20 2022/01/28 09:00:36 wiz Exp $ 1$NetBSD: distinfo,v 1.21 2022/04/25 03:04:59 markd Exp $
2 2
3BLAKE2s (extra-cmake-modules-5.83.0.tar.xz) = fc2a072106405e234f842a7757ebf5bfba080943c1657daa85da059b62a89d0c 3BLAKE2s (extra-cmake-modules-5.93.0.tar.xz) = 51e1e6b145079b6a351debb611292af4c17f88fca920f74b2c7254fd8afcae96
4SHA512 (extra-cmake-modules-5.83.0.tar.xz) = 23085dc82dfcaa63a58a1fcc9fe03db6ce8c31dc059370464240f510de9578f617fe20297b1a8e153dd028db178a3ec7faafb8cd4edaea20913f43ce385c0ecf 4SHA512 (extra-cmake-modules-5.93.0.tar.xz) = a7b79a3db555e7a140ebc49f6b987c5950a2a002cfb4641b30be823dd39b97d3239ce0892c31c8f41463d3a40f6ba9183343a65d52d087bd464289fa93bca882
5Size (extra-cmake-modules-5.83.0.tar.xz) = 314824 bytes 5Size (extra-cmake-modules-5.93.0.tar.xz) = 331192 bytes
6SHA1 (patch-find-modules_FindPythonModuleGeneration.cmake) = 227b3c11f2eacf09e267f77a12b696f82fca50f6 
7SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = fd20a82370a451aa45d4d8fa59127c76bdc5a441 6SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = fd20a82370a451aa45d4d8fa59127c76bdc5a441
 7SHA1 (patch-kde-modules_KDEMetaInfoPlatformCheck.cmake) = 4642c8b7d665af28f2fc79112ae3881356190cb4

File Added: pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDEMetaInfoPlatformCheck.cmake
$NetBSD: patch-kde-modules_KDEMetaInfoPlatformCheck.cmake,v 1.1 2022/04/25 03:04:59 markd Exp $

Add NetBSD to supported platforms

--- kde-modules/KDEMetaInfoPlatformCheck.cmake.orig	2022-03-30 13:04:06.000000000 +0000
+++ kde-modules/KDEMetaInfoPlatformCheck.cmake
@@ -38,6 +38,10 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}")
                 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
                     set(_MetainfoFoundSupportedPlatform true)
                 endif()
+            elseif (${CMAKE_MATCH_1} STREQUAL "NetBSD")
+                if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+                    set(_MetainfoFoundSupportedPlatform true)
+                endif()
             elseif (${CMAKE_MATCH_1} STREQUAL "Windows")
                 if (WIN32)
                     set(_MetainfoFoundSupportedPlatform true)