diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-03 14:55:07 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-03 21:00:20 +0100 |
| commit | 26d1964cd2967eccdad8ab55a7bb26f37a68b49c (patch) | |
| tree | bafc7156c2a09ecca4b472f04774fd3a330b2698 | |
| parent | 9d29b347f09ce711b33d827ec182e8f66a87a0e8 (diff) | |
| download | kde-26d1964cd2967eccdad8ab55a7bb26f37a68b49c.tar.gz kde-26d1964cd2967eccdad8ab55a7bb26f37a68b49c.tar.bz2 kde-26d1964cd2967eccdad8ab55a7bb26f37a68b49c.zip | |
kde-frameworks/extra-cmake-modules: Fix ECMFindQMLModule.cmake.in
Package-Manager: Portage-2.3.16, Repoman-2.3.6
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild | 2 | ||||
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild index f565f9c0be7..06e3c7ef27b 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild @@ -31,6 +31,8 @@ RDEPEND=" app-arch/libarchive[bzip2] " +PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" ) + python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } 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 new file mode 100644 index 00000000000..d1bcf791fd4 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch @@ -0,0 +1,38 @@ +From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sat, 2 Dec 2017 19:04:10 +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: #frameworks, #build_system + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D9116 +--- + modules/ECMFindQMLModule.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +index 428d60a..d72c52b 100644 +--- a/modules/ECMFindQMLModule.cmake.in ++++ b/modules/ECMFindQMLModule.cmake.in +@@ -27,7 +27,7 @@ + + include(FindPackageHandleStandardArgs) + +-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) + if(NOT QMLPLUGINDUMP_PROGRAM) + message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") + endif() +-- +2.15.1 + |