summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-03 14:50:04 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-03 14:50:04 +0000
commit1aa65b411d68d0be8ef0838f97ba38312dcf9560 (patch)
treefd370316425841bd039362f09dfb97bdd318133a
parent381a27f6c53a6a2c70ae5bfe220cebb8afbfea58 (diff)
downloadpackages-1aa65b411d68d0be8ef0838f97ba38312dcf9560.tar.gz
packages-1aa65b411d68d0be8ef0838f97ba38312dcf9560.tar.bz2
packages-1aa65b411d68d0be8ef0838f97ba38312dcf9560.tar.xz
packages-1aa65b411d68d0be8ef0838f97ba38312dcf9560.zip
user/kstars: bump to 3.2.1
-rw-r--r--user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch25
-rw-r--r--user/kstars/APKBUILD22
2 files changed, 7 insertions, 40 deletions
diff --git a/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch b/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch
deleted file mode 100644
index 052b849d9..000000000
--- a/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b2b36b864813e512829ab8a3613f8a91f2bff20e Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Wed, 29 Aug 2018 11:27:38 -0500
-Subject: [PATCH] htmesh: Fix compile error on modern Linux systems
-
----
- kstars/htmesh/SkipListElement.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kstars/htmesh/SkipListElement.h b/kstars/htmesh/SkipListElement.h
-index f8187e42a..52dfff38a 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(__linux__)
- #define KEY_MAX LLONG_MAX
- #else
- #define KEY_MAX LONG_LONG_MAX
---
-2.17.1
-
diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD
index b98404eda..7966eb088 100644
--- a/user/kstars/APKBUILD
+++ b/user/kstars/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kstars
-pkgver=3.0.0
+pkgver=3.2.1
pkgrel=0
pkgdesc="Desktop planetarium"
url="https://www.kde.org/applications/education/kstars/"
@@ -14,14 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kxmlgui-dev kplotting-dev knotifications-dev eigen-dev mesa-dev
qt5-qtwebsockets-dev libraw-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz
- 0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch
- "
+source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz"
build() {
- cd "$builddir"
- mkdir build
- cd build
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -34,19 +29,16 @@ build() {
-DCMAKE_C_FLAGS="$CFLAGS" \
-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
${CMAKE_CROSSOPTS} \
- ..
- make
+ -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
-sha512sums="e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08 kstars-3.0.0.tar.xz
-8c81a6db810a99b7d8bf7adca15767fdbfb79269ab2de1e4136de3c75266dde2fd572b961f63dc9b4f619abf7292e02eed5d29ca9ba53586f30871aba6015fdb 0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch"
+sha512sums="d62d2211db66941c402e19dee28ace235933fe33e077f7de3350c1a80eb02c18b23549c9cc8403fe9d34bc06332501b5ed931f992eb92c605fe7661572c3ed46 kstars-3.2.1.tar.xz"