summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-05 20:32:45 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-09 21:00:37 +0200
commit9cfc05d44141143bf95a9a1869c705f31fd8e706 (patch)
tree069e3ba97880296309e5a036f16faa31c048fa00 /kde-frameworks/extra-cmake-modules/files
parentkde-frameworks/breeze-icons-rcc: drop 5.70* (diff)
downloadgentoo-9cfc05d44141143bf95a9a1869c705f31fd8e706.tar.gz
gentoo-9cfc05d44141143bf95a9a1869c705f31fd8e706.tar.bz2
gentoo-9cfc05d44141143bf95a9a1869c705f31fd8e706.zip
kde-frameworks/extra-cmake-modules: drop 5.70*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/extra-cmake-modules/files')
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch65
1 files changed, 0 insertions, 65 deletions
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
deleted file mode 100644
index 2cbfba7d5eb..00000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
-