aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-05-17 14:38:57 +0200
committerBart Ribbers <bribbers@disroot.org>2021-05-17 15:37:14 +0200
commit2ec98f86c48c3912bab67363bb9c670c3c9577a8 (patch)
treebeffe3cf7f1ada6f6e671c9225ec66131c15de8d
parentef06cd9e9585510030a9047f9c52cf3c3c92eda2 (diff)
downloadaports-2ec98f86c48c3912bab67363bb9c670c3c9577a8.tar.gz
aports-2ec98f86c48c3912bab67363bb9c670c3c9577a8.tar.bz2
aports-2ec98f86c48c3912bab67363bb9c670c3c9577a8.tar.xz
testing/asteroid-calculator: upgrade to 0_git20210517
-rw-r--r--testing/asteroid-calculator/APKBUILD53
1 files changed, 17 insertions, 36 deletions
diff --git a/testing/asteroid-calculator/APKBUILD b/testing/asteroid-calculator/APKBUILD
index a101387a21..a4c1d76881 100644
--- a/testing/asteroid-calculator/APKBUILD
+++ b/testing/asteroid-calculator/APKBUILD
@@ -1,59 +1,40 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-calculator
-pkgver=0_git20210411
+pkgver=0_git20210517
pkgrel=0
-_commit="01a8c7cd02e4c4489e3374ea5c62a954cc11953b"
+_commit="f6cb4cd12a1bed8f491945f8d26bb87bfcfeaa04"
pkgdesc="Default calculator app for AsteroidOS"
url="https://github.com/AsteroidOS/asteroid-calculator"
-arch="all"
+# armhf blocked by qml-asteroid
+arch="all !armhf"
license="GPL-3.0-or-later"
-depends="
- $pkgname-lang
- mapplauncherd
- "
+depends="mapplauncherd"
makedepends="
- bash
- grep
+ extra-cmake-modules
qml-asteroid-dev
qt5-qtbase-dev
qt5-qtdeclarative-dev
- qt5-qttools-dev
- qtchooser
- "
-subpackages="$pkgname-lang"
-source="https://github.com/AsteroidOS/asteroid-calculator/archive/$_commit/asteroid-calculator-$_commit.tar.gz
- fix-build.patch
"
+source="https://github.com/AsteroidOS/asteroid-calculator/archive/$_commit/asteroid-calculator-$_commit.tar.gz"
builddir="$srcdir/$pkgname-$_commit"
build() {
- qmake-qt5 \
- PREFIX=/usr
- make
-
- i18n/generate-desktop.sh . asteroid-calculator.desktop
-
- cd i18n
- lrelease -idbased ./*.ts
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cmake --build build
}
check() {
- make check
+ cd build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- INSTALL_ROOT="$pkgdir" make install
-
- install -Dm644 asteroid-calculator.desktop -t "$pkgdir"/usr/share/applications
-}
-
-lang() {
- cd "$builddir"/i18n
- find . -name "*.ts" | while read -r i; do
- install -Dm644 ${i/ts/qm} -t "$subpkgdir"/usr/share/translations
- done
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="4fcb3ff18a5b9f00f8e600d7749433e588fcdbb3e00548074fa8be8ee2fc493c52cf2488dc940620a1da2e43fbaaa9359a963e8aefd09bd81a248a9314f091c7 asteroid-calculator-01a8c7cd02e4c4489e3374ea5c62a954cc11953b.tar.gz
-0d1557220a492334f237991b8706a54ef6d26eb6b37146264f9f29021d71131d244ce0fe136736a5a551aa53bd7b7c47869d277258fb9f7c4d5e59f076a98eb1 fix-build.patch"
+sha512sums="
+c9974600e11165599f4bdf33dbd3c0fe150fab69cdfc64a89234cda34a17f05788362c31a8abf9e2e01d30371a187cffb35ebe0665b18c9a15daa5883a1129e2 asteroid-calculator-f6cb4cd12a1bed8f491945f8d26bb87bfcfeaa04.tar.gz
+"