1 |
commit: 2d4aa530256e8a86df9357042ea6608e4b0d11e4 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 30 11:05:46 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 30 11:20:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d4aa530 |
7 |
|
8 |
dev-libs/grantlee: Rebase patch on top of master |
9 |
|
10 |
Closes: https://bugs.gentoo.org/701534 |
11 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 -------------- |
15 |
dev-libs/grantlee/files/grantlee-9999-slot.patch | 65 +++++++++++++++++++++++ |
16 |
dev-libs/grantlee/grantlee-9999.ebuild | 2 +- |
17 |
3 files changed, 66 insertions(+), 40 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch |
20 |
deleted file mode 100644 |
21 |
index 5b0d61d5c1..0000000000 |
22 |
--- a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch |
23 |
+++ /dev/null |
24 |
@@ -1,39 +0,0 @@ |
25 |
-Install headers to a custom location to permit slotting with Qt4 version. |
26 |
- |
27 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
28 |
-index 1324566..f98d5da 100644 |
29 |
---- a/CMakeLists.txt |
30 |
-+++ b/CMakeLists.txt |
31 |
-@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6 |
32 |
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) |
33 |
- set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} ) |
34 |
- set( BIN_INSTALL_DIR bin ) |
35 |
--set( INCLUDE_INSTALL_DIR include ) |
36 |
-+set( INCLUDE_INSTALL_DIR include/grantlee5 ) |
37 |
- set( DATA_INSTALL_DIR share/apps ) |
38 |
- |
39 |
- # set up RPATH/install_name_dir |
40 |
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt |
41 |
-index dad2ef8..434d163 100644 |
42 |
---- a/templates/lib/CMakeLists.txt |
43 |
-+++ b/templates/lib/CMakeLists.txt |
44 |
-@@ -107,6 +107,7 @@ if (Qt5Script_FOUND) |
45 |
- |
46 |
- target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) |
47 |
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) |
48 |
-+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
49 |
- target_link_libraries(Grantlee_Templates |
50 |
- LINK_PRIVATE Qt5::Script |
51 |
- ) |
52 |
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt |
53 |
-index 557d262..d2dbaa1 100644 |
54 |
---- a/textdocument/lib/CMakeLists.txt |
55 |
-+++ b/textdocument/lib/CMakeLists.txt |
56 |
-@@ -42,6 +42,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") |
57 |
- ) |
58 |
- endforeach() |
59 |
- endif() |
60 |
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
61 |
- |
62 |
- target_link_libraries(Grantlee_TextDocument |
63 |
- LINK_PUBLIC Qt5::Gui |
64 |
|
65 |
diff --git a/dev-libs/grantlee/files/grantlee-9999-slot.patch b/dev-libs/grantlee/files/grantlee-9999-slot.patch |
66 |
new file mode 100644 |
67 |
index 0000000000..546d623ef7 |
68 |
--- /dev/null |
69 |
+++ b/dev-libs/grantlee/files/grantlee-9999-slot.patch |
70 |
@@ -0,0 +1,65 @@ |
71 |
+From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001 |
72 |
+From: Andreas Sturmlechner <asturm@g.o> |
73 |
+Date: Sat, 30 Nov 2019 11:55:33 +0100 |
74 |
+Subject: [PATCH] Install headers to a custom location to permit slotting |
75 |
+ |
76 |
+That was previously necessary with Qt4 version, let's keep it while |
77 |
+Qt6 is around the corner. |
78 |
+--- |
79 |
+ templates/lib/CMakeLists.txt | 5 +++-- |
80 |
+ textdocument/lib/CMakeLists.txt | 5 +++-- |
81 |
+ 2 files changed, 6 insertions(+), 4 deletions(-) |
82 |
+ |
83 |
+diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt |
84 |
+index 5058481..3ef29a4 100644 |
85 |
+--- a/templates/lib/CMakeLists.txt |
86 |
++++ b/templates/lib/CMakeLists.txt |
87 |
+@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND) |
88 |
+ |
89 |
+ target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) |
90 |
+ target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) |
91 |
++ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
92 |
+ target_link_libraries(Grantlee_Templates |
93 |
+ PRIVATE Qt5::Qml |
94 |
+ ) |
95 |
+@@ -152,10 +153,10 @@ install(FILES |
96 |
+ token.h |
97 |
+ util.h |
98 |
+ variable.h |
99 |
+- DESTINATION include/grantlee COMPONENT Templates |
100 |
++ DESTINATION include/grantlee5/grantlee COMPONENT Templates |
101 |
+ ) |
102 |
+ |
103 |
+ install(FILES |
104 |
+ grantlee_templates.h |
105 |
+- DESTINATION include COMPONENT Templates |
106 |
++ DESTINATION include/grantlee5 COMPONENT Templates |
107 |
+ ) |
108 |
+diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt |
109 |
+index 2c5a96f..c42d32a 100644 |
110 |
+--- a/textdocument/lib/CMakeLists.txt |
111 |
++++ b/textdocument/lib/CMakeLists.txt |
112 |
+@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") |
113 |
+ ) |
114 |
+ endforeach() |
115 |
+ endif() |
116 |
++target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>") |
117 |
+ |
118 |
+ target_link_libraries(Grantlee_TextDocument |
119 |
+ PUBLIC Qt5::Gui |
120 |
+@@ -59,10 +60,10 @@ install(FILES |
121 |
+ texthtmlbuilder.h |
122 |
+ mediawikimarkupbuilder.h |
123 |
+ ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h |
124 |
+- DESTINATION include/grantlee COMPONENT TextDocument |
125 |
++ DESTINATION include/grantlee5/grantlee COMPONENT TextDocument |
126 |
+ ) |
127 |
+ |
128 |
+ install(FILES |
129 |
+ grantlee_textdocument.h |
130 |
+- DESTINATION include COMPONENT TextDocument |
131 |
++ DESTINATION include/grantlee5 COMPONENT TextDocument |
132 |
+ ) |
133 |
+-- |
134 |
+2.24.0 |
135 |
+ |
136 |
|
137 |
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild |
138 |
index 84f512cd9d..3db5604c37 100644 |
139 |
--- a/dev-libs/grantlee/grantlee-9999.ebuild |
140 |
+++ b/dev-libs/grantlee/grantlee-9999.ebuild |
141 |
@@ -32,7 +32,7 @@ RESTRICT="test" |
142 |
|
143 |
PATCHES=( |
144 |
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" |
145 |
- "${FILESDIR}/${PN}-5.1.0-slot.patch" |
146 |
+ "${FILESDIR}/${P}-slot.patch" |
147 |
) |
148 |
|
149 |
src_prepare() { |