gentoo auto-resync : 07:08:2022 - 20:12:29

4 files changed, 0 insertions, 132 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 316a711d6124..c774834a1162 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index be5546f93704..24ccd034f6f7 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,4 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
-AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
-AUX extra-cmake-modules-5.91.0-disable-qmlplugindump.patch 3155 BLAKE2B f01348bebd4aa0498495dc140b623bc132e45ba1b0b596b55eddb4fda2420a28a4ee2e54d06820a5c855e74b7161024c2b771d595b3ab5d8548c6edcb73c8262 SHA512 5c8bd46ef8e702d14b8984e308c58fc7f060cc44072ea53e1a544ffad270c79ea0df79b41025b9c95796bb96400a7ee8b9dcc944d6b3c207b4797f972513c6f1
 AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B f10ceecfbfdad60f628cf1b0c0972f8ebc8db615938b23f300f80855bcc77a6f21d35cb56130df760e3e893ee025689869023048434a3f6329f25181304b4eb6 SHA512 8f046619df65df32736a217ca94439e9c567f6a84a3c736507259b20958c1972d21ee7dcda79b11cc220713010fbfb69f516f0ea1ea2b730e5efb7c32a2fdd04
 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
 DIST extra-cmake-modules-5.96.0.tar.xz 331584 BLAKE2B 7fc907d9feff750d45c6ddedea223ae632d4a70b437df8f9638e6e7ae08c0bf0422ec2696eaea1b1632b472aef50bf71cc3e9e559d9206828ff3d425dcb308a8 SHA512 55625f68453c88b2a5a8ebb6b8ab0b480e9c3681bebdafdf66816499e38dd815cd919bf15b16120be0a2ee8bf50fb3c67e2aa1d652083639ed87fc7ad8c2f705
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
-