Update kstars to 3.3.9

This commit is contained in:
rsadowski 2020-01-09 04:39:34 +00:00
parent 2a6c0b00bd
commit 76aabf7827
5 changed files with 8 additions and 64 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2019/11/25 06:37:45 rsadowski Exp $
# $OpenBSD: Makefile,v 1.24 2020/01/09 04:39:34 rsadowski Exp $
COMMENT = planetarium simulator for KDE
DISTNAME = kstars-3.3.8
DISTNAME = kstars-3.3.9
EPOCH = 0
CATEGORIES = astro education

View File

@ -1,2 +1,2 @@
SHA256 (kstars-3.3.8.tar.xz) = SrVx384DVWc9jpEqpGPTNIZVA5dY3S0BL94Nv8/yug8=
SIZE (kstars-3.3.8.tar.xz) = 70991244
SHA256 (kstars-3.3.9.tar.xz) = 3IwBcLJzWhMZuyHC3dvsvvK10EH0IWvowU4HMLwGk3s=
SIZE (kstars-3.3.9.tar.xz) = 71097252

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2019/11/10 15:01:58 rsadowski Exp $
kstars tries to pass -z nodump to the linker, which is not supported by lld7.
This patch adds a little CMake function to check whether the linker accepts
that flag, and if not does not add it.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -298,8 +298,12 @@ IF (UNIX OR APPLE OR ANDROID)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SEC_COMP_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SEC_COMP_FLAGS}")
SET(SEC_LINK_FLAGS "")
+
+ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CheckNodump.cmake")
+ check_nodump(NODUMP_FLAGS)
+
IF (NOT APPLE)
- SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} -Wl,-z,nodump -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
+ SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} ${NODUMP_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
ENDIF ()
IF (NOT ANDROID AND NOT APPLE)
SET(SEC_LINK_FLAGS "${SEC_LINK_FLAGS} -pie")

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-cmake_modules_CheckNodump_cmake,v 1.1 2019/05/03 16:32:28 rsadowski Exp $
kstars tries to pass -z nodump to the linker, which is not supported by lld7.
This patch adds a little CMake function to check whether the linker accepts
that flag, and if not does not add it.
Index: cmake/modules/CheckNodump.cmake
--- cmake/modules/CheckNodump.cmake.orig
+++ cmake/modules/CheckNodump.cmake
@@ -0,0 +1,23 @@
+# Check if the linker supports -Wl,z,nodump
+
+function(check_nodump result)
+ set(NODUMP_FLAGS "-Wl,-z,nodump")
+ cmake_policy(SET CMP0056 NEW)
+ set(CMAKE_EXE_LINKER_FLAGS "${NODUMP_FLAGS}")
+ set(TEST_PROGRAM "int main() { return 0 ; }")
+ set(TEST_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_nodump.cc")
+ file(WRITE "${TEST_FILE}" "${TEST_PROGRAM}")
+
+ message(STATUS "Checking whether the linker supports ${NODUMP_FLAGS} ...")
+ try_compile(SUPPORT_NODUMP
+ "${CMAKE_CURRENT_BINARY_DIR}/try_has_nodump"
+ "${TEST_FILE}"
+ )
+ message(STATUS " supports ${NODUMP_FLAGS}: ${SUPPORT_NODUMP}")
+
+ if(SUPPORT_NODUMP)
+ set(${result} "${NODUMP_FLAGS}")
+ else()
+ set(${result} "")
+ endif()
+endfunction()

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.10 2019/11/10 15:01:58 rsadowski Exp $
@comment $OpenBSD: PLIST,v 1.11 2020/01/09 04:39:35 rsadowski Exp $
@conflict kde-l10n-*
@conflict kde-i18n-*
@pkgpath x11/kde4/kstars
@bin bin/kstars
lib/libhtmesh.a
@static-lib lib/libhtmesh.a
share/applications/org.kde.kstars.desktop
share/config.kcfg/
share/config.kcfg/kstars.kcfg
@ -604,6 +604,8 @@ share/doc/HTML/it/kstars/devicemanager.png
share/doc/HTML/it/kstars/dumpmode.docbook
share/doc/HTML/it/kstars/ecliptic.docbook
share/doc/HTML/it/kstars/ekos-logs.docbook
share/doc/HTML/it/kstars/ekos-setup.docbook
share/doc/HTML/it/kstars/ekos-tutorials.docbook
share/doc/HTML/it/kstars/ellipticalgalaxies.docbook
share/doc/HTML/it/kstars/epoch.docbook
share/doc/HTML/it/kstars/equinox.docbook