mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-astronomy/kstars: Drop 2.9.5
Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST kstars-2.9.5.tar.xz 64033600 BLAKE2B 1d858d40d1ebccb1ae3217d8f3a464089171a6a9777cf759902017b373ceac3c7e56febf6ec3b2bed5db6cef779252e2d653e3c513545bf55261465465df2274 SHA512 850e3ad31f0c60547c406dc24bf3064f86867557f97acd63fb951d49fb09d7d20462a85016f8c645f316de0310cf7969e08c19e00fc0bedb5c1b006dfda0622b
|
||||
DIST kstars-3.0.0.tar.xz 63604404 BLAKE2B 23754eb1d29b9e7793fac71869045a4e172f8c9aa32dc55d529ef40bf03251d035a2edc68508d887c204389364c2dceba2c9984985bf2ddcc357fc835924f215 SHA512 e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
From 25630e41c71990d619f9f96693624056a8d89039 Mon Sep 17 00:00:00 2001
|
||||
From: Pino Toscano <pino@kde.org>
|
||||
Date: Tue, 31 Jul 2018 20:48:17 +0200
|
||||
Subject: cmake: fix enabling of exceptions
|
||||
|
||||
Use the ECM module KDECompilerSettings unconditionally on every
|
||||
platform, as it provides the kde_enable_exceptions cmake macro needed.
|
||||
This might break build on android, but then the exclusion of
|
||||
KDECompilerSettings on android is a 2 years old hack, most probably
|
||||
working around a different issue which will need its own investigation,
|
||||
and fix.
|
||||
|
||||
Use kde_enable_exceptions() unconditionally, which will do the right job
|
||||
for all the different compilers. This also removes the -Dfexceptions
|
||||
defines (which effectively does nothing), and the manual -fexceptions in
|
||||
htmesh.
|
||||
|
||||
Incidentally, this fixes the build with libraw 0.19.0, which requires
|
||||
the usage of exceptions in case LIBRAW_NO_MEMPOOL_CHECK is not defined.
|
||||
|
||||
* 2018-12-23: asturm@gentoo.org: backported to 2.9.5.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 9 ++++-----
|
||||
kstars/htmesh/CMakeLists.txt | 4 ----
|
||||
2 files changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 69f2409..73224cc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -87,10 +87,7 @@ include(ECMAddAppIcon)
|
||||
include(KDEInstallDirs)
|
||||
include(MacroBoolTo01)
|
||||
include(ECMQtDeclareLoggingCategory)
|
||||
-if(NOT CMAKE_TOOLCHAIN_FILE STREQUAL ${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake)
|
||||
- #We get error "could not find main method" with this module
|
||||
- include(KDECompilerSettings NO_POLICY_SCOPE)
|
||||
-endif()
|
||||
+include(KDECompilerSettings NO_POLICY_SCOPE)
|
||||
include(KDECMakeSettings)
|
||||
include(FeatureSummary)
|
||||
|
||||
@@ -252,8 +249,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
endif()
|
||||
add_definitions(-DQT_NO_CAST_TO_ASCII)
|
||||
|
||||
+# Needed for htmesh, and libraw
|
||||
+kde_enable_exceptions()
|
||||
+
|
||||
if (UNIX)
|
||||
- add_definitions(-Dfexceptions)
|
||||
|
||||
# TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
|
||||
diff --git a/kstars/htmesh/CMakeLists.txt b/kstars/htmesh/CMakeLists.txt
|
||||
index e76d84e..0dbdc8f 100644
|
||||
--- a/kstars/htmesh/CMakeLists.txt
|
||||
+++ b/kstars/htmesh/CMakeLists.txt
|
||||
@@ -32,10 +32,6 @@ IF (ANDROID)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
ENDIF ()
|
||||
|
||||
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
|
||||
-#TODO is there KF5_ENABLE_EXCEPTIONS?
|
||||
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
|
||||
-
|
||||
add_library(htmesh STATIC ${HTMesh_LIB_SRC})
|
||||
|
||||
add_definitions(-D_EXPORTING)
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From cf510e4aee93bf1392df8e35931ba9bb9a07fc16 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Wed, 25 Apr 2018 22:05:50 +0200
|
||||
Subject: [PATCH] Fix build with Qt 5.11 (missing QDoubleValidator)
|
||||
|
||||
Reviewers: mutlaqja
|
||||
|
||||
Subscribers: #kde_edu
|
||||
|
||||
Tags: #kde_edu
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D12525
|
||||
---
|
||||
kstars/dialogs/focusdialog.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp
|
||||
index d09ce9273..b264ee5c9 100644
|
||||
--- a/kstars/dialogs/focusdialog.cpp
|
||||
+++ b/kstars/dialogs/focusdialog.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "skyobjects/skypoint.h"
|
||||
|
||||
#include <KLocalizedString>
|
||||
+#include <QDoubleValidator>
|
||||
#include <KMessageBox>
|
||||
#include <QPushButton>
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit kde5 python-single-r1
|
||||
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
|
||||
KEYWORDS="amd64 x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Desktop Planetarium"
|
||||
HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
|
||||
IUSE="fits indi raw wcs xplanet"
|
||||
|
||||
REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# TODO: AstrometryNet requires new package
|
||||
COMMON_DEPEND="
|
||||
$(add_frameworks_dep kauth)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kcrash)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep knewstuff)
|
||||
$(add_frameworks_dep knotifications)
|
||||
$(add_frameworks_dep knotifyconfig)
|
||||
$(add_frameworks_dep kplotting)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtdeclarative)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtnetwork)
|
||||
$(add_qt_dep qtprintsupport)
|
||||
$(add_qt_dep qtsql)
|
||||
$(add_qt_dep qtsvg)
|
||||
$(add_qt_dep qtwidgets)
|
||||
sys-libs/zlib
|
||||
fits? ( sci-libs/cfitsio )
|
||||
indi? ( >=sci-libs/indilib-1.4.0 )
|
||||
raw? ( media-libs/libraw:= )
|
||||
wcs? ( sci-astronomy/wcslib )
|
||||
xplanet? ( x11-misc/xplanet )
|
||||
"
|
||||
# TODO: Add back when re-enabled by upstream
|
||||
# opengl? (
|
||||
# $(add_qt_dep qtopengl)
|
||||
# virtual/opengl
|
||||
# )
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
$(add_qt_dep qtconcurrent)
|
||||
dev-cpp/eigen:3
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-qt-5.11.patch"
|
||||
"${FILESDIR}/${P}-libraw-0.19.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package fits CFitsio)
|
||||
$(cmake-utils_use_find_package indi INDI)
|
||||
$(cmake-utils_use_find_package raw LibRaw)
|
||||
$(cmake-utils_use_find_package wcs WCSLIB)
|
||||
$(cmake-utils_use_find_package xplanet Xplanet)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
@@ -10,6 +10,5 @@
|
||||
<flag name="indi">Enable support for Astronomical control library using libindi</flag>
|
||||
<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
|
||||
<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag>
|
||||
<flag name="xplanet">Enable support for Xplanet</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
Reference in New Issue
Block a user