haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

KStars: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-07-28 14:43:22 +10:00
parent 929c20f38a
commit 5c1bd67fc3
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kde-base/kstars/kstars-2.9.5.recipe → kde-base/kstars/kstars-2.9.7.recipe
View File

@@ -12,7 +12,7 @@ COPYRIGHT="2010-2018 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/kstars/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="1885ded911bfd3c56df3d551b903b7d1435a4760be5fceee0eefbf9405330f59"
CHECKSUM_SHA256="841c528bde93c6131f7e83c778ed27e22358ca8d84b134bfeff2752be159b311"
PATCHES="kstars-$portVersion.patchset"
ADDITIONAL_FILES="kstars.rdef.in"
@@ -75,7 +75,7 @@ REQUIRES="
"
BUILD_REQUIRES="
extra_cmake_modules >= 5.39
extra_cmake_modules >= 5.47
haiku${secondaryArchSuffix}_devel
devel:eigen$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix

26
kde-base/kstars/patches/kstars-2.9.5.patchset → kde-base/kstars/patches/kstars-2.9.7.patchset
View File

@@ -5,11 +5,11 @@ Subject: Fix build for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 096c597..019caee 100644
index 69f2409..82426c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,6 +247,19 @@ if (UNIX)
endif(UNIX)
@@ -272,6 +272,19 @@ if (ANDROID)
endif ()
# Add security (hardening flags)
+IF (HAIKU)
@@ -28,7 +28,7 @@ index 096c597..019caee 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)
@@ -264,6 +277,7 @@ IF (UNIX OR APPLE OR ANDROID)
@@ -289,6 +302,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,7 +36,7 @@ index 096c597..019caee 100644
# Clang Format support
IF (UNIX OR APPLE)
@@ -374,7 +388,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kstars/version.h.cmake
@@ -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})
@@ -83,10 +83,10 @@ Subject: Native Haiku style for Default theme
diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp
index 4520c6b..9a2b788 100644
index 963309a..70bc9bb 100644
--- a/kstars/auxiliary/thememanager.cpp
+++ b/kstars/auxiliary/thememanager.cpp
@@ -158,9 +158,11 @@ void Manager::slotChangePalette()
@@ -153,9 +153,11 @@ void Manager::slotChangePalette()
if (theme == "Macintosh" || theme == "White Balance" || theme == "High Key" || (theme == "Default" && currentDesktopdefaultTheme().contains("Dark") == false))
themeIconType = BREEZE_THEME;
@@ -100,7 +100,7 @@ index 4520c6b..9a2b788 100644
QString filename = d->themeMap.value(theme);
KSharedConfigPtr config = KSharedConfig::openConfig(filename);
// hint for the style to synchronize the color scheme with the window manager/compositor
@@ -182,6 +184,10 @@ void Manager::slotChangePalette()
@@ -177,6 +179,10 @@ void Manager::slotChangePalette()
if(theme == "Macintosh")
qApp->setStyle(QStyleFactory::create("macintosh"));
@@ -111,7 +111,7 @@ index 4520c6b..9a2b788 100644
else
qApp->setStyle(QStyleFactory::create("Fusion"));
@@ -407,6 +413,12 @@ void Manager::setIconTheme(IconTheme theme)
@@ -402,6 +408,12 @@ void Manager::setIconTheme(IconTheme theme)
themeSearchPaths = themeSearchPaths << QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory);
QString resourcePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory) + QDir::separator() + iconTheme + QDir::separator() + rccFile;
QResource::registerResource(resourcePath, "/icons/" + iconTheme);
@@ -125,10 +125,10 @@ index 4520c6b..9a2b788 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 0b08063..57904c1 100644
index 0b6fb32..070fd04 100644
--- a/kstars/auxiliary/thememanager.h
+++ b/kstars/auxiliary/thememanager.h
@@ -48,7 +48,7 @@ class Manager : public QObject
@@ -42,7 +42,7 @@ class Manager : public QObject
public:
@@ -148,10 +148,10 @@ Subject: Fix strange bug in Haiku x64
diff --git a/datahandlers/catalogdb.cpp b/datahandlers/catalogdb.cpp
index 81c09cc..18bf328 100644
index 3ab805f..5795537 100644
--- a/datahandlers/catalogdb.cpp
+++ b/datahandlers/catalogdb.cpp
@@ -848,6 +848,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
@@ -870,6 +870,11 @@ void CatalogDB::GetAllObjects(const QString &catalog, QList<SkyObject *> &sky_li
// qWarning() << get_query.lastError();
// qWarning() << FindCatalog(catalog);