1 |
commit: bcdf8dffe47f2dc08a6520b1b4bc7c404392cd84 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 20:06:21 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 20:10:32 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcdf8dff |
7 |
|
8 |
sci-astronomy/kstars: Drop 2.9.5 |
9 |
|
10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-astronomy/kstars/Manifest | 1 - |
14 |
.../kstars/files/kstars-2.9.5-libraw-0.19.patch | 73 -------------------- |
15 |
.../kstars/files/kstars-2.9.5-qt-5.11.patch | 31 --------- |
16 |
sci-astronomy/kstars/kstars-2.9.5.ebuild | 79 ---------------------- |
17 |
sci-astronomy/kstars/metadata.xml | 1 - |
18 |
5 files changed, 185 deletions(-) |
19 |
|
20 |
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest |
21 |
index e609ffbb963..34c3cb56d04 100644 |
22 |
--- a/sci-astronomy/kstars/Manifest |
23 |
+++ b/sci-astronomy/kstars/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST kstars-2.9.5.tar.xz 64033600 BLAKE2B 1d858d40d1ebccb1ae3217d8f3a464089171a6a9777cf759902017b373ceac3c7e56febf6ec3b2bed5db6cef779252e2d653e3c513545bf55261465465df2274 SHA512 850e3ad31f0c60547c406dc24bf3064f86867557f97acd63fb951d49fb09d7d20462a85016f8c645f316de0310cf7969e08c19e00fc0bedb5c1b006dfda0622b |
26 |
DIST kstars-3.0.0.tar.xz 63604404 BLAKE2B 23754eb1d29b9e7793fac71869045a4e172f8c9aa32dc55d529ef40bf03251d035a2edc68508d887c204389364c2dceba2c9984985bf2ddcc357fc835924f215 SHA512 e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08 |
27 |
|
28 |
diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch b/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch |
29 |
deleted file mode 100644 |
30 |
index 7db3faada9b..00000000000 |
31 |
--- a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch |
32 |
+++ /dev/null |
33 |
@@ -1,73 +0,0 @@ |
34 |
-From 25630e41c71990d619f9f96693624056a8d89039 Mon Sep 17 00:00:00 2001 |
35 |
-From: Pino Toscano <pino@×××.org> |
36 |
-Date: Tue, 31 Jul 2018 20:48:17 +0200 |
37 |
-Subject: cmake: fix enabling of exceptions |
38 |
- |
39 |
-Use the ECM module KDECompilerSettings unconditionally on every |
40 |
-platform, as it provides the kde_enable_exceptions cmake macro needed. |
41 |
-This might break build on android, but then the exclusion of |
42 |
-KDECompilerSettings on android is a 2 years old hack, most probably |
43 |
-working around a different issue which will need its own investigation, |
44 |
-and fix. |
45 |
- |
46 |
-Use kde_enable_exceptions() unconditionally, which will do the right job |
47 |
-for all the different compilers. This also removes the -Dfexceptions |
48 |
-defines (which effectively does nothing), and the manual -fexceptions in |
49 |
-htmesh. |
50 |
- |
51 |
-Incidentally, this fixes the build with libraw 0.19.0, which requires |
52 |
-the usage of exceptions in case LIBRAW_NO_MEMPOOL_CHECK is not defined. |
53 |
- |
54 |
-* 2018-12-23: asturm@g.o: backported to 2.9.5. |
55 |
- |
56 |
---- |
57 |
- CMakeLists.txt | 9 ++++----- |
58 |
- kstars/htmesh/CMakeLists.txt | 4 ---- |
59 |
- 2 files changed, 4 insertions(+), 9 deletions(-) |
60 |
- |
61 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
62 |
-index 69f2409..73224cc 100644 |
63 |
---- a/CMakeLists.txt |
64 |
-+++ b/CMakeLists.txt |
65 |
-@@ -87,10 +87,7 @@ include(ECMAddAppIcon) |
66 |
- include(KDEInstallDirs) |
67 |
- include(MacroBoolTo01) |
68 |
- include(ECMQtDeclareLoggingCategory) |
69 |
--if(NOT CMAKE_TOOLCHAIN_FILE STREQUAL ${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake) |
70 |
-- #We get error "could not find main method" with this module |
71 |
-- include(KDECompilerSettings NO_POLICY_SCOPE) |
72 |
--endif() |
73 |
-+include(KDECompilerSettings NO_POLICY_SCOPE) |
74 |
- include(KDECMakeSettings) |
75 |
- include(FeatureSummary) |
76 |
- |
77 |
-@@ -252,8 +249,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") |
78 |
- endif() |
79 |
- add_definitions(-DQT_NO_CAST_TO_ASCII) |
80 |
- |
81 |
-+# Needed for htmesh, and libraw |
82 |
-+kde_enable_exceptions() |
83 |
-+ |
84 |
- if (UNIX) |
85 |
-- add_definitions(-Dfexceptions) |
86 |
- |
87 |
- # TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings |
88 |
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor") |
89 |
-diff --git a/kstars/htmesh/CMakeLists.txt b/kstars/htmesh/CMakeLists.txt |
90 |
-index e76d84e..0dbdc8f 100644 |
91 |
---- a/kstars/htmesh/CMakeLists.txt |
92 |
-+++ b/kstars/htmesh/CMakeLists.txt |
93 |
-@@ -32,10 +32,6 @@ IF (ANDROID) |
94 |
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") |
95 |
- ENDIF () |
96 |
- |
97 |
--#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") |
98 |
--#TODO is there KF5_ENABLE_EXCEPTIONS? |
99 |
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") |
100 |
-- |
101 |
- add_library(htmesh STATIC ${HTMesh_LIB_SRC}) |
102 |
- |
103 |
- add_definitions(-D_EXPORTING) |
104 |
--- |
105 |
-cgit v1.1 |
106 |
- |
107 |
|
108 |
diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch b/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch |
109 |
deleted file mode 100644 |
110 |
index 72d4b8e4a48..00000000000 |
111 |
--- a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch |
112 |
+++ /dev/null |
113 |
@@ -1,31 +0,0 @@ |
114 |
-From cf510e4aee93bf1392df8e35931ba9bb9a07fc16 Mon Sep 17 00:00:00 2001 |
115 |
-From: Andreas Sturmlechner <asturm@g.o> |
116 |
-Date: Wed, 25 Apr 2018 22:05:50 +0200 |
117 |
-Subject: [PATCH] Fix build with Qt 5.11 (missing QDoubleValidator) |
118 |
- |
119 |
-Reviewers: mutlaqja |
120 |
- |
121 |
-Subscribers: #kde_edu |
122 |
- |
123 |
-Tags: #kde_edu |
124 |
- |
125 |
-Differential Revision: https://phabricator.kde.org/D12525 |
126 |
---- |
127 |
- kstars/dialogs/focusdialog.cpp | 1 + |
128 |
- 1 file changed, 1 insertion(+) |
129 |
- |
130 |
-diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp |
131 |
-index d09ce9273..b264ee5c9 100644 |
132 |
---- a/kstars/dialogs/focusdialog.cpp |
133 |
-+++ b/kstars/dialogs/focusdialog.cpp |
134 |
-@@ -24,6 +24,7 @@ |
135 |
- #include "skyobjects/skypoint.h" |
136 |
- |
137 |
- #include <KLocalizedString> |
138 |
-+#include <QDoubleValidator> |
139 |
- #include <KMessageBox> |
140 |
- #include <QPushButton> |
141 |
- |
142 |
--- |
143 |
-2.17.0 |
144 |
- |
145 |
|
146 |
diff --git a/sci-astronomy/kstars/kstars-2.9.5.ebuild b/sci-astronomy/kstars/kstars-2.9.5.ebuild |
147 |
deleted file mode 100644 |
148 |
index 5bc717c962f..00000000000 |
149 |
--- a/sci-astronomy/kstars/kstars-2.9.5.ebuild |
150 |
+++ /dev/null |
151 |
@@ -1,79 +0,0 @@ |
152 |
-# Copyright 1999-2018 Gentoo Authors |
153 |
-# Distributed under the terms of the GNU General Public License v2 |
154 |
- |
155 |
-EAPI=6 |
156 |
- |
157 |
-KDE_HANDBOOK="forceoptional" |
158 |
-PYTHON_COMPAT=( python2_7 ) |
159 |
-inherit kde5 python-single-r1 |
160 |
- |
161 |
-if [[ ${KDE_BUILD_TYPE} = release ]]; then |
162 |
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
163 |
- KEYWORDS="amd64 x86" |
164 |
-fi |
165 |
- |
166 |
-DESCRIPTION="Desktop Planetarium" |
167 |
-HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars" |
168 |
-IUSE="fits indi raw wcs xplanet" |
169 |
- |
170 |
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}" |
171 |
- |
172 |
-# TODO: AstrometryNet requires new package |
173 |
-COMMON_DEPEND=" |
174 |
- $(add_frameworks_dep kauth) |
175 |
- $(add_frameworks_dep kconfig) |
176 |
- $(add_frameworks_dep kconfigwidgets) |
177 |
- $(add_frameworks_dep kcoreaddons) |
178 |
- $(add_frameworks_dep kcrash) |
179 |
- $(add_frameworks_dep ki18n) |
180 |
- $(add_frameworks_dep kio) |
181 |
- $(add_frameworks_dep knewstuff) |
182 |
- $(add_frameworks_dep knotifications) |
183 |
- $(add_frameworks_dep knotifyconfig) |
184 |
- $(add_frameworks_dep kplotting) |
185 |
- $(add_frameworks_dep kwidgetsaddons) |
186 |
- $(add_frameworks_dep kxmlgui) |
187 |
- $(add_qt_dep qtdbus) |
188 |
- $(add_qt_dep qtdeclarative) |
189 |
- $(add_qt_dep qtgui) |
190 |
- $(add_qt_dep qtnetwork) |
191 |
- $(add_qt_dep qtprintsupport) |
192 |
- $(add_qt_dep qtsql) |
193 |
- $(add_qt_dep qtsvg) |
194 |
- $(add_qt_dep qtwidgets) |
195 |
- sys-libs/zlib |
196 |
- fits? ( sci-libs/cfitsio ) |
197 |
- indi? ( >=sci-libs/indilib-1.4.0 ) |
198 |
- raw? ( media-libs/libraw:= ) |
199 |
- wcs? ( sci-astronomy/wcslib ) |
200 |
- xplanet? ( x11-misc/xplanet ) |
201 |
-" |
202 |
-# TODO: Add back when re-enabled by upstream |
203 |
-# opengl? ( |
204 |
-# $(add_qt_dep qtopengl) |
205 |
-# virtual/opengl |
206 |
-# ) |
207 |
-DEPEND="${COMMON_DEPEND} |
208 |
- $(add_qt_dep qtconcurrent) |
209 |
- dev-cpp/eigen:3 |
210 |
-" |
211 |
-RDEPEND="${COMMON_DEPEND} |
212 |
- ${PYTHON_DEPS} |
213 |
-" |
214 |
- |
215 |
-PATCHES=( |
216 |
- "${FILESDIR}/${P}-qt-5.11.patch" |
217 |
- "${FILESDIR}/${P}-libraw-0.19.patch" |
218 |
-) |
219 |
- |
220 |
-src_configure() { |
221 |
- local mycmakeargs=( |
222 |
- $(cmake-utils_use_find_package fits CFitsio) |
223 |
- $(cmake-utils_use_find_package indi INDI) |
224 |
- $(cmake-utils_use_find_package raw LibRaw) |
225 |
- $(cmake-utils_use_find_package wcs WCSLIB) |
226 |
- $(cmake-utils_use_find_package xplanet Xplanet) |
227 |
- ) |
228 |
- |
229 |
- kde5_src_configure |
230 |
-} |
231 |
|
232 |
diff --git a/sci-astronomy/kstars/metadata.xml b/sci-astronomy/kstars/metadata.xml |
233 |
index 0b308e6b13c..5dba7fdb56a 100644 |
234 |
--- a/sci-astronomy/kstars/metadata.xml |
235 |
+++ b/sci-astronomy/kstars/metadata.xml |
236 |
@@ -10,6 +10,5 @@ |
237 |
<flag name="indi">Enable support for Astronomical control library using libindi</flag> |
238 |
<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag> |
239 |
<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag> |
240 |
- <flag name="xplanet">Enable support for Xplanet</flag> |
241 |
</use> |
242 |
</pkgmetadata> |