summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-03-11 17:50:58 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-03-11 23:21:16 +0100
commit44fe498c423b888cbe2c88f3776a9144e241c8c9 (patch)
tree261b870b84ede031cca2a8629deb55ce434920fa /kde-frameworks/extra-cmake-modules/files
parentdev-games/openscenegraph: Drop 3.5.1 (diff)
downloadgentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.gz
gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.bz2
gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.zip
kde-frameworks: Drop KDE Frameworks 5.40.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'kde-frameworks/extra-cmake-modules/files')
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch75
1 files changed, 0 insertions, 75 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 a5b12aac357..00000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 099fc991b85e91aa4bbfd20ba005f0c3a0002f97 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 31 Jan 2018 15:32:46 +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: aacid, dfaure, cgiboudeaux, #frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D9116
----
- modules/ECMFindQMLModule.cmake.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..8109ab8 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,8 +26,11 @@
- #=============================================================================
-
- include(FindPackageHandleStandardArgs)
-+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-
--find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+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()
---
-2.16.1
-
-From 3e3ac52aef1bbe22d293a05253c69b755f59428c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 31 Jan 2018 15:58:10 +0100
-Subject: [PATCH] FindQtWaylandScanner.cmake: Use qmake-query for HINT
-
-Instead of hardcoded /usr/lib, same solution as in D9116
----
- find-modules/FindQtWaylandScanner.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake
-index 79a1b05..37ebbdb 100644
---- a/find-modules/FindQtWaylandScanner.cmake
-+++ b/find-modules/FindQtWaylandScanner.cmake
-@@ -86,11 +86,14 @@
- #=============================================================================
-
- include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
-+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-
- ecm_find_package_version_check(QtWaylandScanner)
-
-+query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+
- # Find qtwaylandscanner
--find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
-+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir})
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(QtWaylandScanner
---
-2.16.1
-