Received: by mail.netbsd.org (Postfix, from userid 605) id C480F84D9D; Wed, 17 Jan 2018 19:56:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5135384D7A for ; Wed, 17 Jan 2018 19:56:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id aqHZImYWhwFQ for ; Wed, 17 Jan 2018 19:56:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 942BB84D1F for ; Wed, 17 Jan 2018 19:56:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8DE89FBDE; Wed, 17 Jan 2018 19:56:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1516218978262920" MIME-Version: 1.0 Date: Wed, 17 Jan 2018 19:56:18 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/devel/extra-cmake-modules To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20180117195618.8DE89FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1516218978262920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Wed Jan 17 19:56:18 UTC 2018 Modified Files: pkgsrc/devel/extra-cmake-modules: Makefile PLIST distinfo pkgsrc/devel/extra-cmake-modules/patches: patch-kde-modules_KDECompilerSettings.cmake Log Message: extra-cmake-modules: update tp 5.41.0 16 months worth of updates. requires qt5>=5.7 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/extra-cmake-modules/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/extra-cmake-modules/PLIST cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/extra-cmake-modules/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1516218978262920 Content-Disposition: inline Content-Length: 7123 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/extra-cmake-modules/Makefile diff -u pkgsrc/devel/extra-cmake-modules/Makefile:1.6 pkgsrc/devel/extra-cmake-modules/Makefile:1.7 --- pkgsrc/devel/extra-cmake-modules/Makefile:1.6 Sun Aug 21 21:12:42 2016 +++ pkgsrc/devel/extra-cmake-modules/Makefile Wed Jan 17 19:56:18 2018 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2016/08/21 21:12:42 markd Exp $ +# $NetBSD: Makefile,v 1.7 2018/01/17 19:56:18 markd Exp $ -DISTNAME= extra-cmake-modules-5.25.0 +DISTNAME= extra-cmake-modules-5.41.0 CATEGORIES= devel kde -MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/5.25/} +MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/5.41/} EXTRACT_SUFX= .tar.xz MAINTAINER= markd@NetBSD.org Index: pkgsrc/devel/extra-cmake-modules/PLIST diff -u pkgsrc/devel/extra-cmake-modules/PLIST:1.2 pkgsrc/devel/extra-cmake-modules/PLIST:1.3 --- pkgsrc/devel/extra-cmake-modules/PLIST:1.2 Sun Feb 14 04:13:32 2016 +++ pkgsrc/devel/extra-cmake-modules/PLIST Wed Jan 17 19:56:18 2018 @@ -1,39 +1,58 @@ -@comment $NetBSD: PLIST,v 1.2 2016/02/14 04:13:32 markd Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/01/17 19:56:18 markd Exp $ share/ECM/cmake/ECMConfig.cmake share/ECM/cmake/ECMConfigVersion.cmake share/ECM/find-modules/ECMFindModuleHelpersStub.cmake share/ECM/find-modules/FindEGL.cmake +share/ECM/find-modules/FindGLIB2.cmake +share/ECM/find-modules/FindGperf.cmake +share/ECM/find-modules/FindInotify.cmake share/ECM/find-modules/FindKF5.cmake share/ECM/find-modules/FindLibGit2.cmake share/ECM/find-modules/FindOpenEXR.cmake share/ECM/find-modules/FindPng2Ico.cmake share/ECM/find-modules/FindPoppler.cmake +share/ECM/find-modules/FindPulseAudio.cmake +share/ECM/find-modules/FindPythonModuleGeneration.cmake +share/ECM/find-modules/FindQHelpGenerator.cmake share/ECM/find-modules/FindQtWaylandScanner.cmake +share/ECM/find-modules/FindSasl2.cmake share/ECM/find-modules/FindSharedMimeInfo.cmake share/ECM/find-modules/FindWayland.cmake share/ECM/find-modules/FindWaylandScanner.cmake share/ECM/find-modules/FindX11_XCB.cmake share/ECM/find-modules/FindXCB.cmake +share/ECM/find-modules/GeneratePythonBindingUmbrellaModule.cmake +share/ECM/find-modules/Qt5Ruleset.py +share/ECM/find-modules/rules_engine.py +share/ECM/find-modules/run-sip.py +share/ECM/find-modules/sip_generator.py share/ECM/kde-modules/KDECMakeSettings.cmake share/ECM/kde-modules/KDECompilerSettings.cmake share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake share/ECM/kde-modules/KDEInstallDirs.cmake share/ECM/kde-modules/KDEPackageAppTemplates.cmake +share/ECM/kde-modules/appstreamtest.cmake share/ECM/modules/ECMAddAppIcon.cmake +share/ECM/modules/ECMAddQch.cmake share/ECM/modules/ECMAddTests.cmake share/ECM/modules/ECMCoverageOption.cmake share/ECM/modules/ECMCreateQmFromPoFiles.cmake share/ECM/modules/ECMEnableSanitizers.cmake share/ECM/modules/ECMFindModuleHelpers.cmake +share/ECM/modules/ECMFindQMLModule.cmake.in share/ECM/modules/ECMGenerateHeaders.cmake share/ECM/modules/ECMGeneratePkgConfigFile.cmake share/ECM/modules/ECMGeneratePriFile.cmake +share/ECM/modules/ECMGenerateQmlTypes.cmake share/ECM/modules/ECMInstallIcons.cmake share/ECM/modules/ECMMarkAsTest.cmake share/ECM/modules/ECMMarkNonGuiExecutable.cmake share/ECM/modules/ECMOptionalAddSubdirectory.cmake share/ECM/modules/ECMPackageConfigHelpers.cmake share/ECM/modules/ECMPoQmTools.cmake +share/ECM/modules/ECMQMLModules.cmake +share/ECM/modules/ECMQchDoxygen.config.in +share/ECM/modules/ECMQchDoxygenLayout.xml share/ECM/modules/ECMQmLoader.cpp.in share/ECM/modules/ECMQtDeclareLoggingCategory.cmake share/ECM/modules/ECMQtDeclareLoggingCategory.cpp.in @@ -43,7 +62,9 @@ share/ECM/modules/ECMSetupVersion.cmake share/ECM/modules/ECMUninstallTarget.cmake share/ECM/modules/ECMUseFindModules.cmake share/ECM/modules/ECMVersionHeader.h.in +share/ECM/modules/ECMWinResolveSymlinks.cmake share/ECM/modules/ecm_uninstall.cmake.in +share/ECM/test-modules/test_execute_and_compare.cmake share/ECM/toolchain/Android.cmake share/ECM/toolchain/deployment-file.json.in share/ECM/toolchain/specifydependencies.cmake Index: pkgsrc/devel/extra-cmake-modules/distinfo diff -u pkgsrc/devel/extra-cmake-modules/distinfo:1.5 pkgsrc/devel/extra-cmake-modules/distinfo:1.6 --- pkgsrc/devel/extra-cmake-modules/distinfo:1.5 Sun Aug 21 21:12:42 2016 +++ pkgsrc/devel/extra-cmake-modules/distinfo Wed Jan 17 19:56:18 2018 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2016/08/21 21:12:42 markd Exp $ +$NetBSD: distinfo,v 1.6 2018/01/17 19:56:18 markd Exp $ -SHA1 (extra-cmake-modules-5.25.0.tar.xz) = 199d85a51ee945b3910000e8920abec0187ab18a -RMD160 (extra-cmake-modules-5.25.0.tar.xz) = ec5131315aa6fbf07371eeeda9356e91b540b2d4 -SHA512 (extra-cmake-modules-5.25.0.tar.xz) = 8bfcaffe72278674054052dd68cf5b1ef844a90c02b3e89e1106298640530511933c7aa9f524ef83727643359715fd39fc6fff49d5ca4a47e6fb92a4034dddff -Size (extra-cmake-modules-5.25.0.tar.xz) = 285904 bytes -SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 18ece25450c12a63c05b4604f27e9f90d71163a9 +SHA1 (extra-cmake-modules-5.41.0.tar.xz) = ef5c552af9212ee7e0a563b8407f5daf9d2d808e +RMD160 (extra-cmake-modules-5.41.0.tar.xz) = 7b9e173b69f6823dd1616ee415ffb74f55d71ec7 +SHA512 (extra-cmake-modules-5.41.0.tar.xz) = 034c67ed56ee4f6002ff2f0bfca2d7eb7877180b5aa5cf5eb3babb6e40c0669eb0728f45832bd8250ff304647f9a6555233bff4fdf6eccc9b14b420f4b1c3924 +Size (extra-cmake-modules-5.41.0.tar.xz) = 313940 bytes +SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 0d0c33df8d3207841d48ad2dc51ebe1533866ca1 Index: pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake diff -u pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake:1.1 pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake:1.2 --- pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake:1.1 Tue Jun 7 17:54:59 2016 +++ pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake Wed Jan 17 19:56:18 2018 @@ -1,17 +1,17 @@ -$NetBSD: patch-kde-modules_KDECompilerSettings.cmake,v 1.1 2016/06/07 17:54:59 joerg Exp $ +$NetBSD: patch-kde-modules_KDECompilerSettings.cmake,v 1.2 2018/01/17 19:56:18 markd Exp $ Do not hard-code --enable-new-dtags. It is completely broken on systems like NetBSD implementing the sane rpath semantic and just have a new enough binutils version. It is up to the system compiler to know what the correct platfor choice is. ---- kde-modules/KDECompilerSettings.cmake.orig 2016-06-05 23:16:56.900586724 +0000 +--- kde-modules/KDECompilerSettings.cmake.orig 2017-11-30 07:42:14.000000000 +0000 +++ kde-modules/KDECompilerSettings.cmake -@@ -208,14 +208,6 @@ if (POLICY CMP0063) +@@ -229,14 +229,6 @@ if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() --if (UNIX AND NOT APPLE) +-if (UNIX AND NOT APPLE AND NOT CYGWIN) - # Enable adding DT_RUNPATH, which means that LD_LIBRARY_PATH takes precedence - # over the built-in rPath - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") --_----------=_1516218978262920--