From 6f0730e489e426e2f731c42cb0bdc74eb7e13c68 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 17 Jul 2018 20:54:31 -0500 Subject: user/[KDE Education]: finish bumping to 18.04.3, modernise --- user/kde-education/APKBUILD | 12 ++++-------- user/marble/APKBUILD | 11 +++++------ user/rocs/APKBUILD | 7 +++---- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index b4a47ac4c..10f994499 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,23 +1,19 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=kde-education -pkgver=18.04.1 +pkgver=18.04.3 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" arch="noarch" -license="NCSA" options="!check" # Empty meta package, no point in testing. -depends="artikulate blinken gcompris-qt kalgebra kalzium kanagram kbruch +license="NCSA" +# gcompris-qt is removed until it works with gettext-tiny. +depends="artikulate blinken kalgebra kalzium kanagram kbruch kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz labplot marble rocs step" makedepends="" -install="" -subpackages="" source="org.adelie-linux.about-education.desktop" -build() { - return 0 -} package() { mkdir -p "$pkgdir"/usr/share/applications diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 1b144c9a5..f8d85c20a 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,22 +1,21 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=marble -pkgver=18.04.1 +pkgver=18.04.3 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" arch="all" options="!check" # Test suite requires package to be already installed. -license="LGPL-2.1-only GPL-2.0-only" +license="LGPL-2.1-only AND GPL-2.0-only" depends="shared-mime-info" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev zlib-dev qt5-qtwebkit-dev krunner-dev kcoreaddons-dev kwallet-dev knewstuff-dev kio-dev kparts-dev kcrash-dev ki18n-dev phonon-dev plasma-framework-dev - " -install="" + qt5-qtpositioning-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" -source="http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz" build() { cd "$builddir" @@ -39,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e5839042c80b6cd854a5c350ba87f3fc3193eda52c36caf5effe013b702f524facddba29a236883e4f12c889c01d28c270fd9d9ce424bfd7076dcbbf58e53332 marble-18.04.1.tar.xz" +sha512sums="26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704 marble-18.04.3.tar.xz" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 6c75453b1..b7628e572 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=rocs -pkgver=18.04.1 +pkgver=18.04.3 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -13,9 +13,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev grantlee-dev qt5-qtwebkit-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev" -install="" subpackages="$pkgname-doc $pkgname-lang" -source="http://download.kde.org/stable/applications/$pkgver/src/rocs-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/rocs-$pkgver.tar.xz" build() { cd "$builddir" @@ -43,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df96e1d1b21e065b38e2f054e51521b9113752491576a030bb65ec63b037dcaa81c9f9c1f0f79fa304c8755892dcdde3498424b743ece42991d6f7aadddb459f rocs-18.04.1.tar.xz" +sha512sums="90d7af9934d2eb451882013676dee3d6b9aef421043dc39d17e3bfcc05d03b6c21d1f1836f247cada5e9b78d065d1544828bfc5288df8a1250388e48d26bede5 rocs-18.04.3.tar.xz" -- cgit v1.2.3-60-g2f50