[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 15:29:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 15:30:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b18d984

kde-frameworks/extra-cmake-modules: Add missing patch

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../extra-cmake-modules-5.55.0-clazy-1.5.patch     | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

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 00000000000..0ac07a60ee2
--- /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 <elvis.angelaccio@kde.org>
+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] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     6d01c0493fa5fa86c7a8ee665e75bdd02c8147ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 13:06:24 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 13:06:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d01c049

kde-frameworks/extra-cmake-modules: Add missing patch

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...make-modules-5.65.0-disable-qmlplugindump.patch | 65 ++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
new file mode 100644
index 00000000000..2cbfba7d5eb
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
@@ -0,0 +1,65 @@
+From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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)
+-
+-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
+

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     86e8bf343485dc910db31d883e55aa8c02ebaac9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 22:02:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 22:02:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e8bf34

kde-frameworks/extra-cmake-modules: Add missing patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...make-modules-5.93.0-disable-qmlplugindump.patch | 76 ++++++++++++++++++++++
 ...ke-modules-5.93.0-skip-ecm_add_test-early.patch | 57 ++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
new file mode 100644
index 000000000000..0683bd3effd9
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
@@ -0,0 +1,76 @@
+From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ 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 0ee5665e..d6e1f14c 100644
+--- a/modules/ECMFindQmlModule.cmake.in
++++ b/modules/ECMFindQmlModule.cmake.in
+@@ -7,27 +7,36 @@
+ include(FindPackageHandleStandardArgs)
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
+ 
+-if (QT_MAJOR_VERSION EQUAL "5")
+-    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)
+-    get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
+-endif()
+-
+-if(NOT QMLPLUGINDUMP_PROGRAM)
+-    message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
+-endif()
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
+ 
+-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)
++
++    if (QT_MAJOR_VERSION EQUAL "5")
++        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)
++        get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
++    endif()
++
++    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)
++        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.35.1
+

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
new file mode 100644
index 000000000000..f9eef600724c
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -0,0 +1,57 @@
+From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 11 Jul 2020 23:04:16 +0200
+Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
+ available
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ modules/ECMAddTests.cmake        | 9 +++++++++
+ tests/ECMAddTests/CMakeLists.txt | 4 ++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
+index 58c78d05..994ed1e4 100644
+--- a/modules/ECMAddTests.cmake
++++ b/modules/ECMAddTests.cmake
+@@ -84,6 +84,10 @@ function(ecm_add_test)
+     message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
+   endif()
+ 
++  if(NOT TARGET Qt::Test)
++    return()
++  endif()
++
+   set(_testname ${ARG_NAME_PREFIX}${_targetname})
+   set(gui_args)
+   if(ARG_GUI)
+@@ -127,6 +131,11 @@ function(ecm_add_tests)
+   endif()
+   set(test_names)
+   set(target_names)
++
++  if(NOT TARGET Qt::Test)
++    return()
++  endif()
++
+   foreach(_test_source ${ARG_UNPARSED_ARGUMENTS})
+     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
+--- 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()
+     set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
++
++if(NOT TARGET Qt::Test)
++    message(STATUS "WARNING: skipping tests that require Qt::Test")
++    return()
+ endif()
+ 
+ macro(add_check NAME)
+-- 
+2.35.1
+

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     1ced84c2e271684949e56356a178a0318c28e056
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 21:26:37 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 21:32:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ced84c2

kde-frameworks/extra-cmake-modules: Fix cmake code in patch

skip-ecm_add_test-early.patch broke cmake.

Closes: https://bugs.gentoo.org/837608
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 f9eef600724c..84e192919c78 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 <asturm@gentoo.org>
 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 <asturm@gentoo.org>
 ---
  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] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     c1238783ac0a950fe2db564358064d860af000e1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug  7 09:56:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 15:51:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1238783

kde-frameworks/extra-cmake-modules: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.12
Closes: https://github.com/gentoo/gentoo/pull/26769
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ke-modules-5.72.0-skip-ecm_add_test-early.patch | 54 ---------------
 ...make-modules-5.91.0-disable-qmlplugindump.patch | 76 ----------------------
 2 files changed, 130 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
deleted file mode 100644
index 72541d73e72e..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 11 Jul 2020 23:04:16 +0200
-Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is not available
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- modules/ECMAddTests.cmake        | 9 +++++++++
- tests/ECMAddTests/CMakeLists.txt | 5 +++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
-index 4bc7fb8..12825aa 100644
---- a/modules/ECMAddTests.cmake
-+++ b/modules/ECMAddTests.cmake
-@@ -81,6 +81,10 @@ function(ecm_add_test)
-     message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
-   endif()
- 
-+  if(NOT TARGET Qt5::Test)
-+    return()
-+  endif()
-+
-   set(_testname ${ARG_NAME_PREFIX}${_targetname})
-   set(gui_args)
-   if(ARG_GUI)
-@@ -122,6 +126,11 @@ function(ecm_add_tests)
-   endif()
-   set(test_names)
-   set(target_names)
-+
-+  if(NOT TARGET Qt5::Test)
-+    return()
-+  endif()
-+
-   foreach(_test_source ${ARG_UNPARSED_ARGUMENTS})
-     ecm_add_test(${_test_source}
-       NAME_PREFIX ${ARG_NAME_PREFIX}
-diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
-index e77b33f..4e191fe 100644
---- a/tests/ECMAddTests/CMakeLists.txt
-+++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+if(NOT TARGET Qt5::Test)
-+    message(STATUS "WARNING: skipping tests that require Qt5::Test")
-+    return()
-+endif()
-+
- macro(add_check NAME)
-     string(REPLACE "." "/" dir "${NAME}")
-     string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
--- 
-2.27.0
-

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.91.0-disable-qmlplugindump.patch
deleted file mode 100644
index fbec9a441e37..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-See also: https://phabricator.kde.org/D25812
-
-Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
-BUG: 387753
----
- 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 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")
- 
--if (QT_MAJOR_VERSION EQUAL "5")
--    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
--    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(Qt6 COMPONENTS QmlTools REQUIRED)
--    get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
--endif()
--
--if(NOT QMLPLUGINDUMP_PROGRAM)
--    message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
--endif()
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
- 
--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)
-+
-+    if (QT_MAJOR_VERSION EQUAL "5")
-+        include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-+        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(Qt6 COMPONENTS QmlTools REQUIRED)
-+        get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
-+    endif()
-+
-+    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)
-+        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.34.1
-