Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
Date: Wed, 21 Apr 2021 10:12:11
Message-Id: 1618999923.e96543dff22927a309f4bc9018e88ffd1eafd825.mgorny@gentoo
1 commit: e96543dff22927a309f4bc9018e88ffd1eafd825
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 21 10:11:28 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 21 10:12:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96543df
7
8 x11-misc/qt5ct: Fix install paths
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch | 22 ++++++++++++++++++++++
13 .../{qt5ct-1.2.ebuild => qt5ct-1.2-r1.ebuild} | 7 ++++++-
14 2 files changed, 28 insertions(+), 1 deletion(-)
15
16 diff --git a/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch
17 new file mode 100644
18 index 00000000000..67313d824fa
19 --- /dev/null
20 +++ b/x11-misc/qt5ct/files/qt5ct-1.2-cmake.patch
21 @@ -0,0 +1,22 @@
22 +--- a/CMakeLists.txt
23 ++++ b/CMakeLists.txt
24 +@@ -39,7 +39,7 @@
25 + set(QT_QTPATHS_EXECUTABLE ${QT_QTPATHS_EXECUTABLE}/qtpaths)
26 +
27 + if(EXISTS ${QT_QTPATHS_EXECUTABLE})
28 +- message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE})
29 ++ message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE})
30 + else()
31 + message(FATAL_ERROR "Could NOT find qtpaths executable")
32 + endif()
33 +@@ -54,8 +54,8 @@
34 + add_subdirectory(src/qt5ct-qtplugin)
35 + add_subdirectory(src/qt5ct-style)
36 +
37 +-install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR})
38 +-install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR})
39 ++install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
40 ++install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
41 +
42 + if(UNIX)
43 + add_custom_target(distclean @echo cleaning for source distribution)
44
45 diff --git a/x11-misc/qt5ct/qt5ct-1.2.ebuild b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
46 similarity index 92%
47 rename from x11-misc/qt5ct/qt5ct-1.2.ebuild
48 rename to x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
49 index cadb81998d1..419efe47f94 100644
50 --- a/x11-misc/qt5ct/qt5ct-1.2.ebuild
51 +++ b/x11-misc/qt5ct/qt5ct-1.2-r1.ebuild
52 @@ -24,11 +24,16 @@ RDEPEND="
53 dev-qt/qtgui:5[dbus]
54 )
55 "
56 -DEPEND="${RDEPEND}
57 +DEPEND="${RDEPEND}"
58 +BDEPEND="
59 dev-qt/linguist-tools:5
60 dev-qt/qtpaths:5
61 "
62
63 +PATCHES=(
64 + "${FILESDIR}"/${P}-cmake.patch
65 +)
66 +
67 src_install() {
68 cmake_src_install