1 |
commit: 0c93c3b8eee4b209e5fcf479f4aebfa6e04efcc7 |
2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
3 |
AuthorDate: Mon Feb 27 08:31:44 2023 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 27 09:04:08 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c93c3b8 |
7 |
|
8 |
dev-libs/qxlsx: drop 1.4.4 |
9 |
|
10 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/29823 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
dev-libs/qxlsx/Manifest | 1 - |
15 |
dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch | 26 ------- |
16 |
dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch | 24 ------- |
17 |
dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch | 92 ------------------------ |
18 |
dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch | 23 ------ |
19 |
dev-libs/qxlsx/qxlsx-1.4.4.ebuild | 62 ---------------- |
20 |
6 files changed, 228 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest |
23 |
index 6721b93b6c47..fe1303dabde0 100644 |
24 |
--- a/dev-libs/qxlsx/Manifest |
25 |
+++ b/dev-libs/qxlsx/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST qxlsx-1.4.4.tar.gz 4703732 BLAKE2B 0acf5e708f4dc981723a34b524c820a53a66cb13bf1ce5a1086106230e45dcac2ea6587b3c4ca039de491565ac886a2e5bd1225ee39437ee89a2ff7560da6fd7 SHA512 e6c3dd8822f2a8ab8bcd1a7434db7b202291e3d8de407e4629bdfc1afef507b57da4bc4a715d57b8d75915ce4b623189269083824c35d8e02d49d3e8909cceee |
28 |
DIST qxlsx-1.4.5.tar.gz 4705008 BLAKE2B dd853a20109c9d9dcd5757bbb436e620191eb1fb95c441b1ce3a119bd99397f6206da37b6d770c84e8717c75ce9ad1da4b82397030da02c49a092d958ebef261 SHA512 5ec63c210b12c037acd9f3cc4d351b9bd488add65872a27cca536117349ac2c2501649cb7c2f35e1ee95289e98bf9e9fea6554aef1379deafb50c5016ed21fe5 |
29 |
|
30 |
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch |
31 |
deleted file mode 100644 |
32 |
index ffdf8483f41a..000000000000 |
33 |
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch |
34 |
+++ /dev/null |
35 |
@@ -1,26 +0,0 @@ |
36 |
-From 5d1059941f85365019ed08254e79abdb4ba80ee5 Mon Sep 17 00:00:00 2001 |
37 |
-From: Alexey Sokolov <sokolov@××××××.com> |
38 |
-Date: Sun, 4 Sep 2022 01:22:30 +0100 |
39 |
-Subject: [PATCH] Install library to the correct lib dir |
40 |
- |
41 |
---- |
42 |
- QXlsx/CMakeLists.txt | 6 +++--- |
43 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
44 |
- |
45 |
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt |
46 |
-index a6b1944..fc32918 100644 |
47 |
---- a/CMakeLists.txt |
48 |
-+++ b/CMakeLists.txt |
49 |
-@@ -181,9 +181,9 @@ set_target_properties(QXlsx PROPERTIES |
50 |
- |
51 |
- install(TARGETS QXlsx |
52 |
- EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR} |
53 |
-- RUNTIME DESTINATION bin COMPONENT runtime |
54 |
-- ARCHIVE DESTINATION lib COMPONENT devel |
55 |
-- PUBLIC_HEADER DESTINATION include/QXlsx COMPONENT devel |
56 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime |
57 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel |
58 |
-+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel |
59 |
- ) |
60 |
- |
61 |
- install(EXPORT QXlsxTargets |
62 |
|
63 |
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch |
64 |
deleted file mode 100644 |
65 |
index 15795c645d47..000000000000 |
66 |
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch |
67 |
+++ /dev/null |
68 |
@@ -1,24 +0,0 @@ |
69 |
-From 8e83402db866ae7a67582da28aa68c83545f13c8 Mon Sep 17 00:00:00 2001 |
70 |
-From: Alexey Sokolov <sokolov@××××××.com> |
71 |
-Date: Fri, 26 Aug 2022 01:36:53 +0100 |
72 |
-Subject: [PATCH] Don't force Qt definitions onto users |
73 |
- |
74 |
-It breaks users who use "signals" keyword and convert const char* to |
75 |
-QString. |
76 |
---- |
77 |
- QXlsx/CMakeLists.txt | 2 +- |
78 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
79 |
- |
80 |
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt |
81 |
-index aa774b1..a6b1944 100644 |
82 |
---- a/CMakeLists.txt |
83 |
-+++ b/CMakeLists.txt |
84 |
-@@ -140,7 +140,7 @@ add_library(QXlsx |
85 |
- |
86 |
- add_library(QXlsx::QXlsx ALIAS QXlsx) |
87 |
- |
88 |
--target_compile_definitions(QXlsx PUBLIC |
89 |
-+target_compile_definitions(QXlsx PRIVATE |
90 |
- -DQT_NO_KEYWORDS |
91 |
- -DQT_NO_CAST_TO_ASCII |
92 |
- -DQT_NO_CAST_FROM_ASCII |
93 |
|
94 |
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch |
95 |
deleted file mode 100644 |
96 |
index f94aa6e46414..000000000000 |
97 |
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch |
98 |
+++ /dev/null |
99 |
@@ -1,92 +0,0 @@ |
100 |
-commit e3565f2b3999ead739066b33fa0fd346eb072d87 |
101 |
-Author: Alexey Sokolov <sokolov@××××××.com> |
102 |
-Date: Sun Oct 2 22:46:03 2022 +0100 |
103 |
- |
104 |
- Support installing qt5 and qt6 versions in parallel |
105 |
- |
106 |
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt |
107 |
-index 5640d8a..8d34020 100644 |
108 |
---- a/CMakeLists.txt |
109 |
-+++ b/CMakeLists.txt |
110 |
-@@ -15,8 +15,8 @@ include(GNUInstallDirs) |
111 |
- |
112 |
--find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED) |
113 |
- find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED) |
114 |
-+set(EXPORT_NAME QXlsxQt${QT_VERSION_MAJOR}) |
115 |
- |
116 |
--if (QT_MAJOR_VERSION EQUAL 6) |
117 |
-+if (QT_VERSION_MAJOR EQUAL 6) |
118 |
- set(CMAKE_CXX_STANDARD 17 CACHE STRING "") |
119 |
- else() |
120 |
- set(CMAKE_CXX_STANDARD 11 CACHE STRING "") |
121 |
-@@ -166,7 +167,7 @@ if (BUILD_SHARED_LIBS) |
122 |
- target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB) |
123 |
- endif() |
124 |
- |
125 |
--target_link_libraries(${PROJECT_NAME} |
126 |
-+target_link_libraries(QXlsx |
127 |
- Qt${QT_VERSION_MAJOR}::Core |
128 |
- Qt${QT_VERSION_MAJOR}::GuiPrivate |
129 |
- ) |
130 |
-@@ -180,39 +181,38 @@ PUBLIC |
131 |
- ) |
132 |
- |
133 |
- set_target_properties(QXlsx PROPERTIES |
134 |
-- EXPORT_NAME QXlsx |
135 |
-+ OUTPUT_NAME ${EXPORT_NAME} |
136 |
- VERSION ${PROJECT_VERSION} |
137 |
- SOVERSION 0.${PROJECT_VERSION} |
138 |
- PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}" |
139 |
- ) |
140 |
- |
141 |
- install(TARGETS QXlsx |
142 |
-- EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR} |
143 |
-+ EXPORT ${EXPORT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR} |
144 |
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime |
145 |
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel |
146 |
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel |
147 |
- ) |
148 |
- |
149 |
--install(EXPORT QXlsxTargets |
150 |
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/ |
151 |
-- FILE QXlsxTargets.cmake |
152 |
-+install(EXPORT ${EXPORT_NAME}Targets |
153 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/ |
154 |
-+ FILE ${EXPORT_NAME}Targets.cmake |
155 |
- NAMESPACE QXlsx:: |
156 |
- COMPONENT devel |
157 |
- ) |
158 |
- |
159 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config.cmake.in |
160 |
-- ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake |
161 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake |
162 |
- @ONLY |
163 |
- ) |
164 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config-version.cmake.in |
165 |
-- ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake |
166 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake |
167 |
- @ONLY |
168 |
- ) |
169 |
- install( |
170 |
- FILES |
171 |
-- ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake |
172 |
-- ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake |
173 |
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/ |
174 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake |
175 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake |
176 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/ |
177 |
- ) |
178 |
-- |
179 |
- include(CPackConfig) |
180 |
-diff --git a/QXlsx/cmake/modules/qxlsx-config.cmake.in b/QXlsx/cmake/modules/qxlsx-config.cmake.in |
181 |
-index 1aab813..d72276b 100644 |
182 |
---- a/cmake/modules/qxlsx-config.cmake.in |
183 |
-+++ b/cmake/modules/qxlsx-config.cmake.in |
184 |
-@@ -10,5 +10,5 @@ |
185 |
- SET(prefix "@CMAKE_INSTALL_PREFIX@") |
186 |
- SET(exec_prefix "@CMAKE_INSTALL_PREFIX@") |
187 |
- SET(QXlsx_FOUND "TRUE") |
188 |
-- |
189 |
--include("${CMAKE_CURRENT_LIST_DIR}/QXlsxTargets.cmake") |
190 |
-+ |
191 |
-+include("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@×××××××.cmake") |
192 |
|
193 |
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch |
194 |
deleted file mode 100644 |
195 |
index eff465497930..000000000000 |
196 |
--- a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch |
197 |
+++ /dev/null |
198 |
@@ -1,23 +0,0 @@ |
199 |
-From 647acc3c4d431278f3d2867a41a06d57f1978e63 Mon Sep 17 00:00:00 2001 |
200 |
-From: Alexey Sokolov <sokolov@××××××.com> |
201 |
-Date: Sat, 8 Oct 2022 23:47:23 +0100 |
202 |
-Subject: [PATCH] Set soversion to version |
203 |
- |
204 |
-Since there's no ABI guarantees, as mentioned in #243 |
205 |
---- |
206 |
- QXlsx/CMakeLists.txt | 2 +- |
207 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
208 |
- |
209 |
-diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt |
210 |
-index 8ddfd20..5640d8a 100644 |
211 |
---- a/CMakeLists.txt |
212 |
-+++ b/CMakeLists.txt |
213 |
-@@ -182,7 +182,7 @@ PUBLIC |
214 |
- set_target_properties(QXlsx PROPERTIES |
215 |
- EXPORT_NAME QXlsx |
216 |
- VERSION ${PROJECT_VERSION} |
217 |
-- SOVERSION 0 |
218 |
-+ SOVERSION 0.${PROJECT_VERSION} |
219 |
- PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}" |
220 |
- ) |
221 |
- |
222 |
|
223 |
diff --git a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild |
224 |
deleted file mode 100644 |
225 |
index b68ab4c3e582..000000000000 |
226 |
--- a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild |
227 |
+++ /dev/null |
228 |
@@ -1,62 +0,0 @@ |
229 |
-# Copyright 1999-2023 Gentoo Authors |
230 |
-# Distributed under the terms of the GNU General Public License v2 |
231 |
- |
232 |
-EAPI=8 |
233 |
- |
234 |
-inherit multibuild cmake |
235 |
- |
236 |
-DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt" |
237 |
- |
238 |
-HOMEPAGE="https://github.com/QtExcel/QXlsx" |
239 |
-SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
240 |
- |
241 |
-LICENSE="MIT" |
242 |
-# soversion |
243 |
-SLOT="0/0.${PV}" |
244 |
-KEYWORDS="amd64 ppc ppc64 ~riscv x86" |
245 |
- |
246 |
-IUSE="qt5 qt6" |
247 |
-REQUIRED_USE="|| ( qt5 qt6 )" |
248 |
- |
249 |
-RDEPEND=" |
250 |
- qt5? ( |
251 |
- dev-qt/qtcore:5 |
252 |
- dev-qt/qtgui:5= |
253 |
- ) |
254 |
- qt6? ( |
255 |
- dev-qt/qtbase:6=[gui] |
256 |
- ) |
257 |
-" |
258 |
-DEPEND="${RDEPEND}" |
259 |
- |
260 |
-S="${WORKDIR}/QXlsx-${PV}/QXlsx" |
261 |
-PATCHES=( |
262 |
- "${FILESDIR}/${P}-libdir.patch" |
263 |
- "${FILESDIR}/${P}-qtdefs.patch" |
264 |
- "${FILESDIR}/${P}-soversion.patch" |
265 |
- "${FILESDIR}/${P}-qtversion.patch" |
266 |
-) |
267 |
- |
268 |
-pkg_setup() { |
269 |
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) |
270 |
-} |
271 |
- |
272 |
-src_configure() { |
273 |
- my_src_configure() { |
274 |
- local mycmakeargs=( |
275 |
- -DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}" |
276 |
- ) |
277 |
- |
278 |
- cmake_src_configure |
279 |
- } |
280 |
- |
281 |
- multibuild_foreach_variant my_src_configure |
282 |
-} |
283 |
- |
284 |
-src_compile() { |
285 |
- multibuild_foreach_variant cmake_src_compile |
286 |
-} |
287 |
- |
288 |
-src_install() { |
289 |
- multibuild_foreach_variant cmake_src_install |
290 |
-} |