[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: d414d8d43ee77e45f545fabbf71aaba21cfb2f7a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 10 21:26:37 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 10 21:26:49 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d414d8d4 kde-frameworks/extra-cmake-modules: Fix cmake code in patch skip-ecm_add_test-early.patch broke cmake. Bug: https://bugs.gentoo.org/837608 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ake-modules-5.93.0-skip-ecm_add_test-early.patch | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch index f9eef60072..84e192919c 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch @@ -1,4 +1,4 @@ -From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001 +From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 11 Jul 2020 23:04:16 +0200 Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not @@ -7,8 +7,8 @@ Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not Signed-off-by: Andreas Sturmlechner --- modules/ECMAddTests.cmake| 9 + - tests/ECMAddTests/CMakeLists.txt | 4 - 2 files changed, 13 insertions(+) + tests/ECMAddTests/CMakeLists.txt | 5 + + 2 files changed, 14 insertions(+) diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake index 58c78d05..994ed1e4 100644 @@ -38,20 +38,21 @@ index 58c78d05..994ed1e4 100644 ecm_add_test(${_test_source} NAME_PREFIX ${ARG_NAME_PREFIX} diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt -index aa7e73a1..5fbc1cc7 100644 +index aa7e73a1..f9fb10cb 100644 --- a/tests/ECMAddTests/CMakeLists.txt +++ b/tests/ECMAddTests/CMakeLists.txt -@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6") - set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON") - else() +@@ -4,6 +4,11 @@ else() set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF") -+ + endif() + +if(NOT TARGET Qt::Test) +message(STATUS "WARNING: skipping tests that require Qt::Test") +return() - endif() - ++endif() ++ macro(add_check NAME) + string(REPLACE "." "/" dir "${NAME}") + string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}") -- 2.35.1
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: f6fdd254c3fa5a2c94fa4cfe713d13bd0447eb3b Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Mar 25 19:29:50 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 25 19:29:50 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6fdd254 kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch Closes: https://bugs.gentoo.org/835995 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules/extra-cmake-modules-.ebuild| 2 +- ...extra-cmake-modules-5.93.0-disable-qmlplugindump.patch} | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild index 2d5e795709..df4d73770a 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild @@ -34,7 +34,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" ) python_check_deps() { diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch similarity index 90% rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch index fbec9a441e..0683bd3eff 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch @@ -1,4 +1,4 @@ -From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001 +From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 8 Dec 2019 15:01:33 +0100 Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to @@ -13,7 +13,7 @@ BUG: 387753 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in -index 6c054bf0..1c17c981 100644 +index 0ee5665e..d6e1f14c 100644 --- a/modules/ECMFindQmlModule.cmake.in +++ b/modules/ECMFindQmlModule.cmake.in @@ -7,27 +7,36 @@ @@ -21,8 +21,8 @@ index 6c054bf0..1c17c981 100644 include("${ECM_MODULE_DIR}/QtVersionOption.cmake") -if (QT_MAJOR_VERSION EQUAL "5") --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") --query_qmake(qt_binaries_dir QT_HOST_BINS) +-include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") +-ecm_query_qt(qt_binaries_dir QT_HOST_BINS) -find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -elseif (QT_MAJOR_VERSION EQUAL "6") -find_package(Qt6 COMPONENTS QmlTools REQUIRED) @@ -47,8 +47,8 @@ index 6c054bf0..1c17c981 100644 -set(@GENMODULE@_FOUND FALSE) + +if (QT_MAJOR_VERSION EQUAL "5") -+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -+query_qmake(qt_binaries_dir QT_HOST_BINS) ++include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") ++ecm_query_qt(qt_binaries_dir QT_HOST_BINS) +find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) +elseif (QT_MAJOR_VERSION EQUAL "6") +find_package(Qt6 COMPONENTS QmlTools REQUIRED) @@ -72,5 +72,5 @@ index 6c054bf0..1c17c981 100644 find_package_handle_standard_args(@GENMODULE@ -- -2.34.1 +2.35.1
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: ae99e91c16a6004cb9ddc18b3eb457da50dee243 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 27 19:04:26 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 27 19:04:26 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae99e91c kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch Reported-by: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/831769 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +- ...tra-cmake-modules-5.91.0-disable-qmlplugindump.patch} | 16 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild index a45565a633..2d5e795709 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild @@ -34,7 +34,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.90.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch" ) python_check_deps() { diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch similarity index 86% rename from kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch rename to kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch index db46d3e861..fbec9a441e 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch @@ -1,4 +1,4 @@ -From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001 +From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 8 Dec 2019 15:01:33 +0100 Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to @@ -9,13 +9,13 @@ See also: https://phabricator.kde.org/D25812 Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 BUG: 387753 --- - modules/ECMFindQMLModule.cmake.in | 45 ++- + modules/ECMFindQmlModule.cmake.in | 45 ++- 1 file changed, 27 insertions(+), 18 deletions(-) -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 7cd737b..9847825 100644 a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in +diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in +index 6c054bf0..1c17c981 100644 +--- a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in @@ -7,27 +7,36 @@ include(FindPackageHandleStandardArgs) include("${ECM_MODULE_DIR}/QtVersionOption.cmake") @@ -25,7 +25,7 @@ index 7cd737b..9847825 100644 -query_qmake(qt_binaries_dir QT_HOST_BINS) -find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -elseif (QT_MAJOR_VERSION EQUAL "6") --find_package(Qt6QmlTools REQUIRED) +-find_package(Qt6 COMPONENTS QmlTools REQUIRED) -get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) -endif() - @@ -51,7 +51,7 @@ index 7cd737b..9847825 100644 +query_qmake(qt_binaries_dir QT_HOST_BINS) +find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) +elseif (QT_MAJOR_VERSION EQUAL "6") -+find_package(Qt6QmlTools REQUIRED) ++find_package(Qt6 COMPONENTS QmlTools REQUIRED) +get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) +endif() +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: bfa83df373f42f71c3ed584b9f06021652690c0b Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 29 19:15:23 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 29 19:15:23 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bfa83df3 kde-frameworks/extra-cmake-modules: Drop obsolete patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...make-modules-5.74.0-disable-qmlplugindump.patch | 65 -- ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 -- 2 files changed, 130 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch deleted file mode 100644 index 08fcf32338..00 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 8 Dec 2019 15:01:33 +0100 -Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to - avoid sandbox violations - -Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135 -BUG: 387753 - modules/ECMFindQMLModule.cmake.in | 35 +++ - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 8109ab8..1edc01d 100644 a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -26,23 +26,32 @@ - #= - - include(FindPackageHandleStandardArgs) --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") - --query_qmake(qt_binaries_dir QT_INSTALL_BINS) -+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) - --find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) --if(NOT QMLPLUGINDUMP_PROGRAM) --message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") --endif() -- --execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) -- --if(ExitCode EQUAL 0) -+if(ECM_DISABLE_QMLPLUGINDUMP) -+message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") - set(@GENMODULE@_FOUND TRUE) --set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") -+set(@GENMODULE@_VERSION @VERSION@) - else() --message(STATUS "qmlplugindump failed for @MODULE_NAME@.") --set(@GENMODULE@_FOUND FALSE) -+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -+ -+query_qmake(qt_binaries_dir QT_INSTALL_BINS) -+ -+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) -+if(NOT QMLPLUGINDUMP_PROGRAM) -+message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") -+endif() -+ -+execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) -+ -+if(ExitCode EQUAL 0) -+set(@GENMODULE@_FOUND TRUE) -+set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") -+else() -+message(STATUS "qmlplugindump failed for @MODULE_NAME@.") -+set(@GENMODULE@_FOUND FALSE) -+endif() - endif() - - find_package_handle_standard_args(@GENMODULE@ --- -2.24.0 - diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch deleted file mode 100644 index f2c8368898..00 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 8 Dec 2019 15:01:33 +0100 -Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to - avoid sandbox violations - -Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135 -BUG: 387753 - modules/ECMFindQMLModule.cmake.in | 35 +++ - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 4234b702..d9817fe8 100644 a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -5,23 +5,32 @@ - #= - - include(FindPackageHandleStandardArgs)
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: d67d29299a7347b02b43ccefa5a3884aaf7b7989 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 9 16:01:42 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 9 16:01:42 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d67d2929 kde-frameworks/extra-cmake-modules: Drop obsolete patch Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 -- 1 file changed, 41 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch deleted file mode 100644 index 0ac07a60ee..00 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001 -From: Elvis Angelaccio -Date: Sat, 2 Feb 2019 18:46:27 +0100 -Subject: Fix ENABLE_CLAZY option with clazy >= 1.5 - -Summary: -clazy 1.5 renamed its plugin from from `ClangLazy.so` to -`ClazyPlugin.so` and from `clang-lazy` to `clazy`. - -Reviewers: apol, smartins - -Subscribers: kde-frameworks-devel, kde-buildsystem - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D18680 - kde-modules/KDECMakeSettings.cmake | 7 ++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake -index 3f7f5a8..17d79a0 100644 a/kde-modules/KDECMakeSettings.cmake -+++ b/kde-modules/KDECMakeSettings.cmake -@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - option(ENABLE_CLAZY "Enable Clazy warnings" OFF) - - if(ENABLE_CLAZY) --set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") -+find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX}) -+if(CLAZY_v1_5_FOUND) # clazy >= 1.5 -+set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy") -+else() # clazy < 1.5 -+set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") -+endif() - endif() - endif() - --- -cgit v1.1 -
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: ea4a2e9336ed805197c758c9d991ac85bcbe7547 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 6 00:06:58 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 6 00:06:58 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea4a2e93 kde-frameworks/extra-cmake-modules: Fix detection of >=clazy-1.5 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.55.0.ebuild | 5 ++- .../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild index 3a8e3d7b38..91fdffe863 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild @@ -33,7 +33,10 @@ RDEPEND=" app-arch/libarchive[bzip2] " -PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" + "${FILESDIR}/${P}-clazy-1.5.patch" +) python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch new file mode 100644 index 00..0ac07a60ee --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch @@ -0,0 +1,41 @@ +From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001 +From: Elvis Angelaccio +Date: Sat, 2 Feb 2019 18:46:27 +0100 +Subject: Fix ENABLE_CLAZY option with clazy >= 1.5 + +Summary: +clazy 1.5 renamed its plugin from from `ClangLazy.so` to +`ClazyPlugin.so` and from `clang-lazy` to `clazy`. + +Reviewers: apol, smartins + +Subscribers: kde-frameworks-devel, kde-buildsystem + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D18680 +--- + kde-modules/KDECMakeSettings.cmake | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake +index 3f7f5a8..17d79a0 100644 +--- a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake +@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + option(ENABLE_CLAZY "Enable Clazy warnings" OFF) + + if(ENABLE_CLAZY) +-set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") ++find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX}) ++if(CLAZY_v1_5_FOUND) # clazy >= 1.5 ++set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy") ++else() # clazy < 1.5 ++set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") ++endif() + endif() + endif() + +-- +cgit v1.1 +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: d02ce6c1b55141859d389596b079200ad6e9e400 Author: Michael Palimaka gentoo org> AuthorDate: Sun Aug 19 14:00:12 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 19 14:00:25 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d02ce6c1 kde-frameworks/extra-cmake-modules: avoid build failure with GCC8 and ld.gold Bug: https://bugs.gentoo.org/663512 Package-Manager: Portage-2.3.44, Repoman-2.3.10 .../extra-cmake-modules-.ebuild | 2 ++ ...extra-cmake-modules-5.49.0-no-fatal-warnings.patch | 19 +++ 2 files changed, 21 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild index e25c18f8b4..8ca8a79e63 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild @@ -31,6 +31,8 @@ RDEPEND=" app-arch/libarchive[bzip2] " +PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) + python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch new file mode 100644 index 00..f71d19d5fc --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch @@ -0,0 +1,19 @@ +Avoid triggering a build failure with GCC8 and ld.gold producing warnings. + +Bug: https://bugs.gentoo.org/663512 + +diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake +index 44358fb..0270aa5 100644 +--- a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake +@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)) + # Linker warnings should be treated as errors +-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") +-set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}") ++#set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") ++#set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}") + + # Do not allow undefined symbols, even in non-symbolic shared libraries + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: 0bf8d8508920f66509333f57024a4fa29735b027 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 11 16:42:04 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 11 23:59:22 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0bf8d850 kde-frameworks/extra-cmake-modules: Drop unused patch Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 -- 1 file changed, 38 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch deleted file mode 100644 index d1bcf791fd..00 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner-Date: Sat, 2 Dec 2017 19:04:10 +0100 -Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump - -Summary: -Without any hint, qmlplugindump version is whatever default is set by qtchooser. -Fix uses the same approach as FindQtWaylandScanner.cmake. - -Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. - -Reviewers: apol - -Subscribers: #frameworks, #build_system - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D9116 - modules/ECMFindQMLModule.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 428d60a..d72c52b 100644 a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -27,7 +27,7 @@ - - include(FindPackageHandleStandardArgs) - --find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) -+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) - if(NOT QMLPLUGINDUMP_PROGRAM) - message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") - endif() --- -2.15.1 -
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: 62059b22d73b38cdbc1553fba036ad23644b8e49 Author: Johannes Huber gentoo org> AuthorDate: Fri Jan 5 08:55:00 2018 + Commit: Johannes Huber gentoo org> CommitDate: Fri Jan 5 08:55:00 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=62059b22 kde-frameworks/extra-cmake-modules: Remove unused patches Package-Manager: Portage-2.3.19, Repoman-2.3.6 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 -- 1 file changed, 38 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch deleted file mode 100644 index d1bcf791fd..00 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner-Date: Sat, 2 Dec 2017 19:04:10 +0100 -Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump - -Summary: -Without any hint, qmlplugindump version is whatever default is set by qtchooser. -Fix uses the same approach as FindQtWaylandScanner.cmake. - -Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. - -Reviewers: apol - -Subscribers: #frameworks, #build_system - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D9116 - modules/ECMFindQMLModule.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 428d60a..d72c52b 100644 a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -27,7 +27,7 @@ - - include(FindPackageHandleStandardArgs) - --find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) -+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) - if(NOT QMLPLUGINDUMP_PROGRAM) - message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") - endif() --- -2.15.1 -
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 26d1964cd2967eccdad8ab55a7bb26f37a68b49c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 3 13:55:07 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 3 20:00:20 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=26d1964c kde-frameworks/extra-cmake-modules: Fix ECMFindQMLModule.cmake.in Package-Manager: Portage-2.3.16, Repoman-2.3.6 .../extra-cmake-modules-5.41.0.ebuild | 2 ++ ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ++ 2 files changed, 40 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild index f565f9c0be..06e3c7ef27 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild @@ -31,6 +31,8 @@ RDEPEND=" app-arch/libarchive[bzip2] " +PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" ) + python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch new file mode 100644 index 00..d1bcf791fd --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch @@ -0,0 +1,38 @@ +From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner+Date: Sat, 2 Dec 2017 19:04:10 +0100 +Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump + +Summary: +Without any hint, qmlplugindump version is whatever default is set by qtchooser. +Fix uses the same approach as FindQtWaylandScanner.cmake. + +Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. + +Reviewers: apol + +Subscribers: #frameworks, #build_system + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D9116 +--- + modules/ECMFindQMLModule.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +index 428d60a..d72c52b 100644 +--- a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +@@ -27,7 +27,7 @@ + + include(FindPackageHandleStandardArgs) + +-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) + if(NOT QMLPLUGINDUMP_PROGRAM) + message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") + endif() +-- +2.15.1 +
[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 04fcdaa4e06d3878779436179ae26010a45129b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 14 21:45:18 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 15 08:14:48 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04fcdaa4 kde-frameworks/extra-cmake-modules: Drop ECMAddTest patch again Package-Manager: Portage-2.3.7, Repoman-2.3.3 .../extra-cmake-modules-.ebuild| 2 - .../extra-cmake-modules-5.37.0-ecmaddtest.patch| 74 -- 2 files changed, 76 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild index 0edb669dcb..aa4cb7d3f0 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild @@ -31,8 +31,6 @@ RDEPEND=" app-arch/libarchive[bzip2] " -PATCHES=( "${FILESDIR}/${PN}-5.37.0-ecmaddtest.patch" ) - python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch deleted file mode 100644 index fe86754188..00 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b99d2d2c5dedcaba9745dddc1dd7b8d4811babf1 Mon Sep 17 00:00:00 2001 -From: Kevin Funk-Date: Mon, 7 Aug 2017 15:50:25 +0200 -Subject: RFC: Make ECMAddTests respect BUILD_TESTING - -Summary: -Use-case: Make building unit tests optional, by just following the CMake -BUILD_TESTING option. - -The usual approach to conditionally build tests is to do: -``` -if (BUILD_TESTING) -add_executable(TestOne TestOne.cpp) -target_link_libraries(TestOne my_library) -endif() -``` - -or: - -``` -if (BUILD_TESTING) -add_subdirectory(tests) -endif() -``` - -This patch just turns all calls to ecm_add_test(...) into no-ops if -BUILD_TESTING=OFF. - -See: - https://cmake.org/cmake/help/v3.6/module/CTest.html - -Reviewers: vkrause - -Reviewed By: vkrause - -Subscribers: kossebau, vkrause, elvisangelaccio, asturmlechner, apol, #frameworks, #build_system - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D7187 - modules/ECMAddTests.cmake | 10 ++ - 1 file changed, 10 insertions(+) - -diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake -index 9667388..c77a7aa 100644 a/modules/ECMAddTests.cmake -+++ b/modules/ECMAddTests.cmake -@@ -49,6 +49,12 @@ - # be given; this will be used for both the target and test names (and, as with - # ecm_add_tests(), the NAME_PREFIX argument will be prepended to the test name). - # -+# If BUILD_TESTING is set to OFF, ecm_add_test will turn into a no-op and thus -+# will not add any test-related targets -+# -+# BUILD_TESTING is created as a cache variable by the CTest module and by the -+# :kde-module:`KDECMakeSettings` module. -+# - # - # Since pre-1.0.0. - -@@ -84,6 +90,10 @@ include(ECMMarkAsTest) - include(ECMMarkNonGuiExecutable) - - function(ecm_add_test) -+ if(NOT BUILD_TESTING) -+ return() # turn this function into a no-op -+ endif() -+ - set(options GUI) - # TARGET_NAME_VAR and TEST_NAME_VAR are undocumented args used by - # ecm_add_tests --- -cgit v0.11.2