gentoo resync : 16.02.1018

2 files changed, 0 insertions, 104 deletions

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
deleted file mode 100644
index 7db3faada9bd..000000000000
--- a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
+++ /dev/null
@@ -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
-
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
deleted file mode 100644
index 72d4b8e4a48a..000000000000
--- a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch
+++ /dev/null
@@ -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
-