From 497a8effc912d994bd030987e2f4577330bf3309 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 8 Jan 2020 00:44:15 +1000 Subject: [PATCH] KStars: bump version --- ...stars-2.9.8.recipe => kstars-3.3.9.recipe} | 18 +-- ...s-2.9.8.patchset => kstars-3.3.9.patchset} | 116 +++++++----------- 2 files changed, 51 insertions(+), 83 deletions(-) rename kde-base/kstars/{kstars-2.9.8.recipe => kstars-3.3.9.recipe} (93%) rename kde-base/kstars/patches/{kstars-2.9.8.patchset => kstars-3.3.9.patchset} (74%) diff --git a/kde-base/kstars/kstars-2.9.8.recipe b/kde-base/kstars/kstars-3.3.9.recipe similarity index 93% rename from kde-base/kstars/kstars-2.9.8.recipe rename to kde-base/kstars/kstars-3.3.9.recipe index 97d361037..10d9913a5 100644 --- a/kde-base/kstars/kstars-2.9.8.recipe +++ b/kde-base/kstars/kstars-3.3.9.recipe @@ -8,11 +8,11 @@ For students and teachers, it supports adjustable simulation speeds in order to phenomena that happen over long timescales, the KStars Astrocalculator to predict \ conjunctions, and many common astronomical calculations." HOMEPAGE="https://edu.kde.org/kstars" -COPYRIGHT="2010-2018 KDE Organisation" +COPYRIGHT="2010-2019 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" -SOURCE_URI="https://github.com/KDE/kstars/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="d9eeb673907847c41c759f535af5e28e6ea9c2d8b87842eb91a07291fd239509" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/kstars/kstars-$portVersion.tar.xz" +CHECKSUM_SHA256="dc8c0170b2735a1319bb21c2dddbecbef2b5d041f4216be8c14e0730bc06937b" PATCHES="kstars-$portVersion.patchset" ADDITIONAL_FILES="kstars.rdef.in" @@ -76,7 +76,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.50 + extra_cmake_modules$secondaryArchSuffix >= 5.65 devel:eigen$secondaryArchSuffix devel:libkdeinit5_kded5$secondaryArchSuffix devel:libkdeinit5_klauncher$secondaryArchSuffix @@ -118,15 +118,16 @@ BUILD_REQUIRES=" devel:libKF5WidgetsAddons$secondaryArchSuffix devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix >= 5.7 + devel:libQt5Core$secondaryArchSuffix >= 5.14 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python2 + cmd:python2 " BUILD() @@ -139,7 +140,8 @@ BUILD() -DCMAKE_INSTALL_PREFIX=$appsDir/KStars \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ -DSHARE_INSTALL_PREFIX=$dataDir \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_DOC=OFF make $jobArgs } diff --git a/kde-base/kstars/patches/kstars-2.9.8.patchset b/kde-base/kstars/patches/kstars-3.3.9.patchset similarity index 74% rename from kde-base/kstars/patches/kstars-2.9.8.patchset rename to kde-base/kstars/patches/kstars-3.3.9.patchset index e14f1b4c9..79a71fb08 100644 --- a/kde-base/kstars/patches/kstars-2.9.8.patchset +++ b/kde-base/kstars/patches/kstars-3.3.9.patchset @@ -1,14 +1,14 @@ -From 46929274bb54d893e3642feca39b0fe8561957d4 Mon Sep 17 00:00:00 2001 +From 9f236c815be14fe65ca3244a03366827c684084f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 9 May 2018 20:50:37 +1000 +Date: Wed, 8 Jan 2020 00:21:30 +1000 Subject: Fix build for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index 69f2409..82426c1 100644 +index 93b6b35..17a6d29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -272,6 +272,19 @@ if (ANDROID) +@@ -290,6 +290,19 @@ if (ANDROID) endif () # Add security (hardening flags) @@ -28,7 +28,7 @@ index 69f2409..82426c1 100644 IF (UNIX OR APPLE OR ANDROID) SET(SEC_COMP_FLAGS "-D_FORTIFY_SOURCE=2 -fstack-protector-all -Wcast-align -fPIE") IF (NOT ANDROID AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) -@@ -289,6 +302,7 @@ IF (UNIX OR APPLE OR ANDROID) +@@ -311,6 +324,7 @@ IF (UNIX OR APPLE OR ANDROID) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SEC_LINK_FLAGS}") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SEC_LINK_FLAGS}") ENDIF () @@ -36,54 +36,33 @@ index 69f2409..82426c1 100644 # Clang Format support IF (UNIX OR APPLE) -@@ -399,7 +413,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kstars/version.h.cmake - # let our config.h be found first in any case - include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - -+IF (NOT HAIKU) - add_subdirectory(doc) -+ENDIF () +@@ -428,7 +442,7 @@ endif() add_subdirectory(kstars) add_subdirectory(datahandlers) -diff --git a/kstars/htmesh/SkipListElement.h b/kstars/htmesh/SkipListElement.h -index f8187e4..a14cd7d 100644 ---- a/kstars/htmesh/SkipListElement.h -+++ b/kstars/htmesh/SkipListElement.h -@@ -20,7 +20,7 @@ - #define KEY_MAX _I64_MAX - #else - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || \ -- (defined(__SUNPRO_CC) && defined(__sun)) || defined(__APPLE__) -+ (defined(__SUNPRO_CC) && defined(__sun)) || defined(__APPLE__) || defined(__HAIKU__) - #define KEY_MAX LLONG_MAX - #else - #define KEY_MAX LONG_LONG_MAX -diff --git a/kstars/htmesh/SpatialGeneral.h b/kstars/htmesh/SpatialGeneral.h -index 450119e..4c822d0 100644 ---- a/kstars/htmesh/SpatialGeneral.h -+++ b/kstars/htmesh/SpatialGeneral.h -@@ -101,7 +101,7 @@ const float64 gEpsilon = 1.0E-15; - // standard explicit template instantiation, define. - // +-IF (NOT ANDROID) ++IF (NOT ANDROID AND NOT HAIKU) + IF (BUILD_TESTING) + enable_testing(true) + add_subdirectory(Tests) +diff --git a/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp +index 1718342..a76c208 100644 +--- a/datahandlers/catalogdb.cpp ++++ b/datahandlers/catalogdb.cpp +@@ -906,6 +906,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList &sky_li + // qWarning() << get_query.lastError(); + // qWarning() << FindCatalog(catalog); --#if defined(__APPLE__) -+#if defined(__APPLE__) || defined(__HAIKU__) - #define LINKAGE - #endif - --- -2.16.2 - - -From 3f9a1566406f46e614fe80a4143d52ae321b5b6f Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 9 May 2018 20:51:23 +1000 -Subject: Native Haiku style for Default theme - - ++#if defined(__x86_64__) && defined(__HAIKU__) ++ if (FindCatalog(catalog) < 0) ++ return; ++#endif ++ + if (!get_query.exec()) + { + qWarning() << get_query.lastQuery(); diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp -index 963309a..70bc9bb 100644 +index a0e2b5d..5f76174 100644 --- a/kstars/auxiliary/thememanager.cpp +++ b/kstars/auxiliary/thememanager.cpp @@ -153,9 +153,11 @@ void Manager::slotChangePalette() @@ -125,7 +104,7 @@ index 963309a..70bc9bb 100644 //TODO On Linux on non-KDE Distros, find out if the themes are installed or not and perhaps warn the user #endif diff --git a/kstars/auxiliary/thememanager.h b/kstars/auxiliary/thememanager.h -index 0b6fb32..070fd04 100644 +index 8eafbfa..09bab99 100644 --- a/kstars/auxiliary/thememanager.h +++ b/kstars/auxiliary/thememanager.h @@ -42,7 +42,7 @@ class Manager : public QObject @@ -137,32 +116,19 @@ index 0b6fb32..070fd04 100644 ~Manager(); static Manager* instance(); --- -2.16.2 - - -From 8cda7d619e4cc0c4bcbb7c7aa71ee3bc70abc82b Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 10 May 2018 20:24:54 +1000 -Subject: Fix strange bug in Haiku x64 - - -diff --git a/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp -index 3ab805f..5795537 100644 ---- a/datahandlers/catalogdb.cpp -+++ b/datahandlers/catalogdb.cpp -@@ -870,6 +870,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList &sky_li - // qWarning() << get_query.lastError(); - // qWarning() << FindCatalog(catalog); +diff --git a/kstars/htmesh/SpatialGeneral.h b/kstars/htmesh/SpatialGeneral.h +index fa3ae42..660498a 100644 +--- a/kstars/htmesh/SpatialGeneral.h ++++ b/kstars/htmesh/SpatialGeneral.h +@@ -101,7 +101,7 @@ const float64 gEpsilon = 1.0E-15; + // standard explicit template instantiation, define. + // + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__HAIKU__) + #define LINKAGE + #endif -+#if defined(__x86_64__) && defined(__HAIKU__) -+ if (FindCatalog(catalog) < 0) -+ return; -+#endif -+ - if (!get_query.exec()) - { - qWarning() << get_query.lastQuery(); -- -2.16.2 +2.24.1