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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 -
