1 |
commit: a5abf6a3da6f8e3c71eaf00d3c182e1db9843d13 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 14 09:17:40 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 14 09:18:15 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5abf6a3 |
7 |
|
8 |
dev-libs/grantlee: Rebase grantlee-{9999 => 5.3.0}-slot.patch |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
...e-9999-slot.patch => grantlee-5.3.0-slot.patch} | 30 ++++++++++------------ |
13 |
dev-libs/grantlee/grantlee-9999.ebuild | 14 +++++----- |
14 |
2 files changed, 21 insertions(+), 23 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch |
17 |
similarity index 78% |
18 |
rename from dev-libs/grantlee/files/grantlee-9999-slot.patch |
19 |
rename to dev-libs/grantlee/files/grantlee-5.3.0-slot.patch |
20 |
index 9490df2327..896290499d 100644 |
21 |
--- a/dev-libs/grantlee/files/grantlee-9999-slot.patch |
22 |
+++ b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch |
23 |
@@ -1,31 +1,28 @@ |
24 |
-From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001 |
25 |
+From f9dda5f8a81c18c59eabcea515084253c284803a Mon Sep 17 00:00:00 2001 |
26 |
From: Andreas Sturmlechner <asturm@g.o> |
27 |
Date: Sat, 30 Nov 2019 11:55:33 +0100 |
28 |
Subject: [PATCH] Install headers to a custom location to permit slotting |
29 |
|
30 |
That was previously necessary with Qt4 version, let's keep it while |
31 |
Qt6 is around the corner. |
32 |
- |
33 |
-Amended with target_include_directories fix by jospezial. |
34 |
- |
35 |
--- |
36 |
templates/lib/CMakeLists.txt | 5 +++-- |
37 |
textdocument/lib/CMakeLists.txt | 5 +++-- |
38 |
2 files changed, 6 insertions(+), 4 deletions(-) |
39 |
|
40 |
diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt |
41 |
-index 5058481..3ef29a4 100644 |
42 |
+index 07a192c..9049bdc 100644 |
43 |
--- a/templates/lib/CMakeLists.txt |
44 |
+++ b/templates/lib/CMakeLists.txt |
45 |
-@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND) |
46 |
+@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND OR Qt6Qml_FOUND) |
47 |
|
48 |
target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) |
49 |
target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) |
50 |
+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") |
51 |
- target_link_libraries(Grantlee_Templates |
52 |
- PRIVATE Qt5::Qml |
53 |
- ) |
54 |
-@@ -152,10 +153,10 @@ install(FILES |
55 |
+ if (GRANTLEE_BUILD_WITH_QT6) |
56 |
+ target_link_libraries(Grantlee_Templates |
57 |
+ PRIVATE Qt6::Qml |
58 |
+@@ -164,10 +165,10 @@ install(FILES |
59 |
token.h |
60 |
util.h |
61 |
variable.h |
62 |
@@ -39,18 +36,18 @@ index 5058481..3ef29a4 100644 |
63 |
+ DESTINATION include/grantlee5 COMPONENT Templates |
64 |
) |
65 |
diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt |
66 |
-index 2c5a96f..c42d32a 100644 |
67 |
+index a472267..8134d83 100644 |
68 |
--- a/textdocument/lib/CMakeLists.txt |
69 |
+++ b/textdocument/lib/CMakeLists.txt |
70 |
@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") |
71 |
) |
72 |
endforeach() |
73 |
endif() |
74 |
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") |
75 |
++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
76 |
|
77 |
- target_link_libraries(Grantlee_TextDocument |
78 |
- PUBLIC Qt5::Gui |
79 |
-@@ -59,10 +60,10 @@ install(FILES |
80 |
+ if (GRANTLEE_BUILD_WITH_QT6) |
81 |
+ target_link_libraries(Grantlee_TextDocument |
82 |
+@@ -65,10 +66,10 @@ install(FILES |
83 |
texthtmlbuilder.h |
84 |
mediawikimarkupbuilder.h |
85 |
${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h |
86 |
@@ -64,4 +61,5 @@ index 2c5a96f..c42d32a 100644 |
87 |
+ DESTINATION include/grantlee5 COMPONENT TextDocument |
88 |
) |
89 |
-- |
90 |
-2.24.0 |
91 |
+2.37.3 |
92 |
+ |
93 |
|
94 |
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild |
95 |
index 26b6932c53..133c2a70f0 100644 |
96 |
--- a/dev-libs/grantlee/grantlee-9999.ebuild |
97 |
+++ b/dev-libs/grantlee/grantlee-9999.ebuild |
98 |
@@ -15,10 +15,8 @@ SLOT="5" |
99 |
KEYWORDS="" |
100 |
IUSE="debug doc test" |
101 |
|
102 |
-BDEPEND=" |
103 |
- doc? ( app-doc/doxygen[dot] ) |
104 |
- test? ( dev-qt/linguist-tools:5 ) |
105 |
-" |
106 |
+RESTRICT="!test? ( test )" |
107 |
+ |
108 |
RDEPEND=" |
109 |
dev-qt/qtcore:5 |
110 |
dev-qt/qtdeclarative:5 |
111 |
@@ -27,12 +25,14 @@ RDEPEND=" |
112 |
DEPEND="${RDEPEND} |
113 |
test? ( dev-qt/qttest:5 ) |
114 |
" |
115 |
- |
116 |
-RESTRICT="!test? ( test )" |
117 |
+BDEPEND=" |
118 |
+ doc? ( app-doc/doxygen[dot] ) |
119 |
+ test? ( dev-qt/linguist-tools:5 ) |
120 |
+" |
121 |
|
122 |
PATCHES=( |
123 |
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" |
124 |
- "${FILESDIR}/${P}-slot.patch" |
125 |
+ "${FILESDIR}/${PN}-5.3.0-slot.patch" # TODO: Qt5 specific |
126 |
) |
127 |
|
128 |
src_configure() { |