1 |
commit: b25193eca46c3cd588ff2abfa8c99a3e62d52341 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 25 15:21:03 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 25 15:35:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25193ec |
7 |
|
8 |
sci-geosciences/qmapshack: Drop 1.14.0, unbuildable with Qt 5.15 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/761079 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
sci-geosciences/qmapshack/Manifest | 1 - |
15 |
sci-geosciences/qmapshack/files/FindPROJ4.cmake | 152 --------------------- |
16 |
.../qmapshack/files/qmapshack-positioning.patch | 9 -- |
17 |
.../qmapshack/files/qmapshack-qt-5.15.patch | 67 --------- |
18 |
sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild | 38 ------ |
19 |
5 files changed, 267 deletions(-) |
20 |
|
21 |
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest |
22 |
index c0b96c104ce..3ddd56bffe9 100644 |
23 |
--- a/sci-geosciences/qmapshack/Manifest |
24 |
+++ b/sci-geosciences/qmapshack/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99 |
27 |
DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a |
28 |
|
29 |
diff --git a/sci-geosciences/qmapshack/files/FindPROJ4.cmake b/sci-geosciences/qmapshack/files/FindPROJ4.cmake |
30 |
deleted file mode 100644 |
31 |
index 093deaa79ae..00000000000 |
32 |
--- a/sci-geosciences/qmapshack/files/FindPROJ4.cmake |
33 |
+++ /dev/null |
34 |
@@ -1,152 +0,0 @@ |
35 |
-#.rst: |
36 |
-# FindPROJ4 |
37 |
-# -------- |
38 |
-# |
39 |
-# Find the proj includes and library. |
40 |
-# |
41 |
-# IMPORTED Targets |
42 |
-# ^^^^^^^^^^^^^^^^ |
43 |
-# |
44 |
-# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``, |
45 |
-# if Proj.4 has been found. |
46 |
-# |
47 |
-# Result Variables |
48 |
-# ^^^^^^^^^^^^^^^^ |
49 |
-# |
50 |
-# This module defines the following variables: |
51 |
-# |
52 |
-# :: |
53 |
-# |
54 |
-# PROJ4_INCLUDE_DIRS - where to find proj_api.h, etc. |
55 |
-# PROJ4_LIBRARIES - List of libraries when using libproj. |
56 |
-# PROJ4_FOUND - True if libproj found. |
57 |
-# |
58 |
-# :: |
59 |
-# |
60 |
-# PROJ4_VERSION - The version of libproj found (x.y.z) |
61 |
-# PROJ4_VERSION_MAJOR - The major version of libproj |
62 |
-# PROJ4_VERSION_MINOR - The minor version of libproj |
63 |
-# PROJ4_VERSION_PATCH - The patch version of libproj |
64 |
-# PROJ4_VERSION_TWEAK - always 0 |
65 |
-# PROJ4_VERSION_COUNT - The number of version components, always 3 |
66 |
-# |
67 |
-# Hints |
68 |
-# ^^^^^ |
69 |
-# |
70 |
-# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this |
71 |
-# module where to look exclusively. |
72 |
- |
73 |
-#============================================================================= |
74 |
-# Copyright 2016 Kai Pastor |
75 |
-# |
76 |
-# |
77 |
-# This file was derived from CMake 3.5's module FindZLIB.cmake |
78 |
-# which has the following terms: |
79 |
-# |
80 |
-# Copyright 2001-2011 Kitware, Inc. |
81 |
-# |
82 |
-# Redistribution and use in source and binary forms, with or without |
83 |
-# modification, are permitted provided that the following conditions are |
84 |
-# met: |
85 |
-# |
86 |
-# * Redistributions of source code must retain the above copyright notice, |
87 |
-# this list of conditions and the following disclaimer. |
88 |
-# |
89 |
-# * Redistributions in binary form must reproduce the above copyright notice, |
90 |
-# this list of conditions and the following disclaimer in the documentation |
91 |
-# and/or other materials provided with the distribution. |
92 |
-# |
93 |
-# * The names of Kitware, Inc., the Insight Consortium, or the names of |
94 |
-# any consortium members, or of any contributors, may not be used to |
95 |
-# endorse or promote products derived from this software without |
96 |
-# specific prior written permission. |
97 |
-# |
98 |
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' |
99 |
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
100 |
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
101 |
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR |
102 |
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
103 |
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
104 |
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
105 |
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
106 |
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
107 |
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
108 |
-#============================================================================= |
109 |
- |
110 |
-# Search PROJ4_ROOT exclusively if it is set. |
111 |
-if(PROJ4_ROOT) |
112 |
- set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH) |
113 |
-else() |
114 |
- set(_PROJ4_SEARCH) |
115 |
-endif() |
116 |
- |
117 |
-find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h ${_PROJ4_SEARCH} PATH_SUFFIXES include) |
118 |
-mark_as_advanced(PROJ4_INCLUDE_DIR) |
119 |
- |
120 |
-if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h") |
121 |
- file(STRINGS "${PROJ4_INCLUDE_DIR}/proj_api.h" PROJ4_H REGEX "^#define PJ_VERSION [0-9]+$") |
122 |
- |
123 |
- string(REGEX REPLACE "^.*PJ_VERSION ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ4_H}") |
124 |
- string(REGEX REPLACE "^.*PJ_VERSION [0-9]([0-9]).*$" "\\1" PROJ4_VERSION_MINOR "${PROJ4_H}") |
125 |
- string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}") |
126 |
- set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}") |
127 |
- set(PROJ4_VERSION_COUNT 3) |
128 |
-endif() |
129 |
- |
130 |
-# Allow PROJ4_LIBRARY to be set manually, as the location of the proj library |
131 |
-if(NOT PROJ4_LIBRARY) |
132 |
- set(PROJ4_NAMES proj) |
133 |
- set(PROJ4_NAMES_DEBUG projd) |
134 |
- if(WIN32 AND DEFINED PROJ4_VERSION_MAJOR AND DEFINED PROJ4_VERSION_MINOR) |
135 |
- list(APPEND PROJ4_NAMES proj_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) |
136 |
- list(APPEND PROJ4_NAMES projd_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR}) |
137 |
- endif() |
138 |
- find_library(PROJ4_LIBRARY_RELEASE NAMES ${PROJ4_NAMES} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) |
139 |
- find_library(PROJ4_LIBRARY_DEBUG NAMES ${PROJ4_NAMES_DEBUG} ${_PROJ4_SEARCH} PATH_SUFFIXES lib) |
140 |
- include(SelectLibraryConfigurations) |
141 |
- select_library_configurations(PROJ4) |
142 |
-endif() |
143 |
- |
144 |
-# handle the QUIETLY and REQUIRED arguments and set PROJ4_FOUND to TRUE if |
145 |
-# all listed variables are TRUE |
146 |
-include(FindPackageHandleStandardArgs) |
147 |
-find_package_handle_standard_args(PROJ4 |
148 |
- REQUIRED_VARS |
149 |
- PROJ4_LIBRARY |
150 |
- PROJ4_INCLUDE_DIR |
151 |
- VERSION_VAR |
152 |
- PROJ4_VERSION |
153 |
-) |
154 |
- |
155 |
-if(PROJ4_FOUND) |
156 |
- set(PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR}) |
157 |
- |
158 |
- if(NOT PROJ4_LIBRARIES) |
159 |
- set(PROJ4_LIBRARIES ${PROJ4_LIBRARY}) |
160 |
- endif() |
161 |
- |
162 |
- if(NOT TARGET PROJ4::proj) |
163 |
- add_library(PROJ4::proj UNKNOWN IMPORTED) |
164 |
- set_target_properties(PROJ4::proj PROPERTIES |
165 |
- INTERFACE_INCLUDE_DIRECTORIES "${PROJ4_INCLUDE_DIRS}") |
166 |
- |
167 |
- if(PROJ4_LIBRARY_RELEASE) |
168 |
- set_property(TARGET PROJ4::proj APPEND PROPERTY |
169 |
- IMPORTED_CONFIGURATIONS RELEASE) |
170 |
- set_target_properties(PROJ4::proj PROPERTIES |
171 |
- IMPORTED_LOCATION_RELEASE "${PROJ4_LIBRARY_RELEASE}") |
172 |
- endif() |
173 |
- |
174 |
- if(PROJ4_LIBRARY_DEBUG) |
175 |
- set_property(TARGET PROJ4::proj APPEND PROPERTY |
176 |
- IMPORTED_CONFIGURATIONS DEBUG) |
177 |
- set_target_properties(PROJ4::proj PROPERTIES |
178 |
- IMPORTED_LOCATION_DEBUG "${PROJ4_LIBRARY_DEBUG}") |
179 |
- endif() |
180 |
- |
181 |
- if(NOT PROJ4_LIBRARY_RELEASE AND NOT PROJ4_LIBRARY_DEBUG) |
182 |
- set_property(TARGET PROJ4::proj APPEND PROPERTY |
183 |
- IMPORTED_LOCATION "${PROJ4_LIBRARY}") |
184 |
- endif() |
185 |
- endif() |
186 |
-endif() |
187 |
|
188 |
diff --git a/sci-geosciences/qmapshack/files/qmapshack-positioning.patch b/sci-geosciences/qmapshack/files/qmapshack-positioning.patch |
189 |
deleted file mode 100644 |
190 |
index c0f13fc884e..00000000000 |
191 |
--- a/sci-geosciences/qmapshack/files/qmapshack-positioning.patch |
192 |
+++ /dev/null |
193 |
@@ -1,9 +0,0 @@ |
194 |
-diff -U2 qmapshack-1.13.0.orig/CMakeLists.txt qmapshack-1.13.0/CMakeLists.txt |
195 |
---- qmapshack-1.13.0.orig/CMakeLists.txt 2019-04-08 18:08:10.000000000 +0200 |
196 |
-+++ qmapshack-1.13.0/CMakeLists.txt 2019-05-06 23:19:15.330580322 +0200 |
197 |
-@@ -131,4 +131,5 @@ |
198 |
- find_package(Qt5LinguistTools REQUIRED) |
199 |
- find_package(Qt5PrintSupport REQUIRED) |
200 |
-+find_package(Qt5Positioning REQUIRED) |
201 |
- find_package(Qt5UiTools REQUIRED) |
202 |
- find_package(Qt5Network REQUIRED) |
203 |
|
204 |
diff --git a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch b/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch |
205 |
deleted file mode 100644 |
206 |
index 08d8946f69d..00000000000 |
207 |
--- a/sci-geosciences/qmapshack/files/qmapshack-qt-5.15.patch |
208 |
+++ /dev/null |
209 |
@@ -1,67 +0,0 @@ |
210 |
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp |
211 |
---- qmapshack-V_1.15.0.orig/src/qmapshack/gis/wpt/CGisItemWpt.cpp 2020-06-14 17:22:49.000000000 +0700 |
212 |
-+++ qmapshack-V_1.15.0/src/qmapshack/gis/wpt/CGisItemWpt.cpp 2020-06-22 17:41:58.776553045 +0700 |
213 |
-@@ -38,6 +38,7 @@ |
214 |
- |
215 |
- #include <QtWidgets> |
216 |
- #include <QtXml> |
217 |
-+#include <QPainterPath> |
218 |
- |
219 |
- IGisItem::key_t CGisItemWpt::keyUserFocus; |
220 |
- QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap; |
221 |
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp |
222 |
---- qmapshack-V_1.15.0.orig/src/qmapshack/helpers/CDraw.cpp 2020-06-14 17:22:49.000000000 +0700 |
223 |
-+++ qmapshack-V_1.15.0/src/qmapshack/helpers/CDraw.cpp 2020-06-22 17:45:43.431558615 +0700 |
224 |
-@@ -24,6 +24,7 @@ |
225 |
- #include <QImage> |
226 |
- #include <QPointF> |
227 |
- #include <QtMath> |
228 |
-+#include <QPainterPath> |
229 |
- |
230 |
- QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2); |
231 |
- QPen CDraw::penBorderGray(Qt::lightGray, 2); |
232 |
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp |
233 |
---- qmapshack-V_1.15.0.orig/src/qmapshack/map/CMapIMG.cpp 2020-06-14 17:22:49.000000000 +0700 |
234 |
-+++ qmapshack-V_1.15.0/src/qmapshack/map/CMapIMG.cpp 2020-06-22 17:47:21.413561045 +0700 |
235 |
-@@ -33,6 +33,7 @@ |
236 |
- #include "units/IUnit.h" |
237 |
- |
238 |
- #include <QtWidgets> |
239 |
-+#include <QPainterPath> |
240 |
- |
241 |
- #undef DEBUG_SHOW_SECT_DESC |
242 |
- #undef DEBUG_SHOW_TRE_DATA |
243 |
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp |
244 |
---- qmapshack-V_1.15.0.orig/src/qmapshack/mouse/IMouseSelect.cpp 2020-06-14 17:22:49.000000000 +0700 |
245 |
-+++ qmapshack-V_1.15.0/src/qmapshack/mouse/IMouseSelect.cpp 2020-06-22 17:43:31.338555340 +0700 |
246 |
-@@ -23,6 +23,7 @@ |
247 |
- #include "mouse/IScrOpt.h" |
248 |
- |
249 |
- #include <QtWidgets> |
250 |
-+#include <QPainterPath> |
251 |
- |
252 |
- IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse) |
253 |
- : IMouse(gis, canvas, mouse) |
254 |
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp |
255 |
---- qmapshack-V_1.15.0.orig/src/qmaptool/helpers/CDraw.cpp 2020-06-14 17:22:49.000000000 +0700 |
256 |
-+++ qmapshack-V_1.15.0/src/qmaptool/helpers/CDraw.cpp 2020-06-22 17:49:14.789563856 +0700 |
257 |
-@@ -24,6 +24,7 @@ |
258 |
- #include <QImage> |
259 |
- #include <QPointF> |
260 |
- #include <QtMath> |
261 |
-+#include <QPainterPath> |
262 |
- |
263 |
- QPen CDraw::penBorderBlue(QColor(10,10,150,220),2); |
264 |
- QPen CDraw::penBorderGray(Qt::lightGray,2); |
265 |
-diff -U3 -r qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp |
266 |
---- qmapshack-V_1.15.0.orig/src/qmaptool/overlay/COverlayCutMap.cpp 2020-06-14 17:22:49.000000000 +0700 |
267 |
-+++ qmapshack-V_1.15.0/src/qmaptool/overlay/COverlayCutMap.cpp 2020-06-22 17:50:08.109565178 +0700 |
268 |
-@@ -24,6 +24,8 @@ |
269 |
- |
270 |
- #include <functional> |
271 |
- #include <QtWidgets> |
272 |
-+#include <QPainterPath> |
273 |
-+ |
274 |
- using std::bind; |
275 |
- |
276 |
- static inline qreal sqr(qreal a) |
277 |
|
278 |
diff --git a/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild |
279 |
deleted file mode 100644 |
280 |
index acb33f65883..00000000000 |
281 |
--- a/sci-geosciences/qmapshack/qmapshack-1.14.0.ebuild |
282 |
+++ /dev/null |
283 |
@@ -1,38 +0,0 @@ |
284 |
-# Copyright 1999-2020 Gentoo Authors |
285 |
-# Distributed under the terms of the GNU General Public License v2 |
286 |
- |
287 |
-EAPI=7 |
288 |
- |
289 |
-inherit cmake-utils xdg |
290 |
- |
291 |
-DESCRIPTION="GPS mapping utility" |
292 |
-HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" |
293 |
-SRC_URI="https://github.com/Maproom/${PN}/archive/V_1.14.0.tar.gz -> ${P}.tar.gz" |
294 |
-LICENSE="GPL-3+" |
295 |
-SLOT="0" |
296 |
-KEYWORDS="amd64 x86" |
297 |
-IUSE="" |
298 |
-RDEPEND="dev-qt/qtwebengine:5[widgets] |
299 |
- dev-qt/qtdeclarative:5[widgets] |
300 |
- dev-qt/qtprintsupport:5 |
301 |
- dev-qt/qtpositioning:5 |
302 |
- dev-qt/qtdbus:5 |
303 |
- dev-qt/qttest:5 |
304 |
- dev-qt/designer:5 |
305 |
- dev-qt/qtnetwork:5[ssl] |
306 |
- dev-qt/qtsql:5 |
307 |
- dev-libs/quazip |
308 |
- >=sci-geosciences/routino-3.1.1 |
309 |
- sci-libs/gdal |
310 |
- >=sci-libs/proj-5.0.0 |
311 |
- sci-libs/alglib" |
312 |
-DEPEND="${RDEPEND} |
313 |
- dev-qt/linguist-tools:5" |
314 |
- |
315 |
-PATCHES=( "${FILESDIR}"/${PN}-positioning.patch ) |
316 |
-S="${WORKDIR}"/${PN}-V_${PV} |
317 |
- |
318 |
-src_prepare() { |
319 |
- cmake-utils_src_prepare |
320 |
- cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die |
321 |
-} |