diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-06-12 17:14:39 -0500 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2022-06-12 23:51:56 +0000 |
commit | fae109bb7d85ae36b60de53259b52bcfe053a618 (patch) | |
tree | 33602e922be83cf0e73462f21c1ec04dfb43e791 | |
parent | 229d6dbaa539b775f55d56dc62ea65b995729651 (diff) | |
download | packages-fae109bb7d85ae36b60de53259b52bcfe053a618.tar.gz packages-fae109bb7d85ae36b60de53259b52bcfe053a618.tar.bz2 packages-fae109bb7d85ae36b60de53259b52bcfe053a618.tar.xz packages-fae109bb7d85ae36b60de53259b52bcfe053a618.zip |
user/labplot: Update to 2.9.0
-rw-r--r-- | user/labplot/APKBUILD | 11 | ||||
-rw-r--r-- | user/labplot/cantor.patch | 25 |
2 files changed, 4 insertions, 32 deletions
diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD index b16ffccee..6aabbd392 100644 --- a/user/labplot/APKBUILD +++ b/user/labplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=labplot -pkgver=2.8.0 +pkgver=2.9.0 pkgrel=0 pkgdesc="Interactive tool for graphing and analysis of scientific data" url="https://www.kde.org/applications/education/labplot2" @@ -15,11 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev cantor-dev docbook-xsl lz4-dev poppler-dev poppler-qt5-dev - kuserfeedback-dev" + kuserfeedback-dev readstat-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz - cantor.patch - " +source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -45,5 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b96a758813a411801ca65082aab54857b2da77a705ea939f2ae49d6d75a3c472b666e61c501283482c7736975b1f589bf0710028a36b237ae2df9e56ac04f0e5 labplot-2.8.0.tar.xz -1d8b81a2eb9e4aa2909881f0ea481252200f5821250d8e8a47ac941bd223bb86f5b1c404c2b374af69b0d491c50f9179a34f30ba5829a5279119761dcf5fe49d cantor.patch" +sha512sums="d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45 labplot-2.9.0.tar.xz" diff --git a/user/labplot/cantor.patch b/user/labplot/cantor.patch deleted file mode 100644 index a35db4585..000000000 --- a/user/labplot/cantor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From db67605842837583b1b885cf64ca19c5301480d1 Mon Sep 17 00:00:00 2001 -From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de> -Date: Wed, 16 Sep 2020 17:27:08 +0200 -Subject: [PATCH] [cantor] 20.08 will not get the new interface - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57ad46dd8..98130a30d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -230,7 +230,7 @@ IF (Cantor_FOUND) - ELSE () - MESSAGE (STATUS "Cantor Library ${Cantor_VERSION} TOO OLD. Minimum usable version is 19.12") - ENDIF () -- IF (${Cantor_VERSION} VERSION_GREATER "20.08") -+ IF (${Cantor_VERSION} VERSION_GREATER "20.08.9") - add_definitions (-DHAVE_NEW_CANTOR_LIBS) - ENDIF () - ELSE () --- -GitLab - |