Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/
Date: Fri, 05 Jan 2018 08:56:11
Message-Id: 1515142500.62059b22d73b38cdbc1553fba036ad23644b8e49.johu@gentoo
1 commit: 62059b22d73b38cdbc1553fba036ad23644b8e49
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 5 08:55:00 2018 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 5 08:55:00 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=62059b22
7
8 kde-frameworks/extra-cmake-modules: Remove unused patches
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ----------------------
13 1 file changed, 38 deletions(-)
14
15 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
16 deleted file mode 100644
17 index d1bcf791fd..0000000000
18 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
19 +++ /dev/null
20 @@ -1,38 +0,0 @@
21 -From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001
22 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
23 -Date: Sat, 2 Dec 2017 19:04:10 +0100
24 -Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
25 -
26 -Summary:
27 -Without any hint, qmlplugindump version is whatever default is set by qtchooser.
28 -Fix uses the same approach as FindQtWaylandScanner.cmake.
29 -
30 -Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
31 -
32 -Reviewers: apol
33 -
34 -Subscribers: #frameworks, #build_system
35 -
36 -Tags: #frameworks, #build_system
37 -
38 -Differential Revision: https://phabricator.kde.org/D9116
39 ----
40 - modules/ECMFindQMLModule.cmake.in | 2 +-
41 - 1 file changed, 1 insertion(+), 1 deletion(-)
42 -
43 -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
44 -index 428d60a..d72c52b 100644
45 ---- a/modules/ECMFindQMLModule.cmake.in
46 -+++ b/modules/ECMFindQMLModule.cmake.in
47 -@@ -27,7 +27,7 @@
48 -
49 - include(FindPackageHandleStandardArgs)
50 -
51 --find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
52 -+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
53 - if(NOT QMLPLUGINDUMP_PROGRAM)
54 - message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
55 - endif()
56 ---
57 -2.15.1
58 -