From 9154199aefb06292965a2e9a75cd945636d253d4 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Mon, 17 May 2021 14:20:29 +0200
Subject: [PATCH] testing/asteroid-compass: upgrade to 0_git20210517
---
testing/asteroid-compass/APKBUILD | 39 ++++++++++++++-----------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/testing/asteroid-compass/APKBUILD b/testing/asteroid-compass/APKBUILD
index 49a7ab812665..16d7849ad6d4 100644
--- a/testing/asteroid-compass/APKBUILD
+++ b/testing/asteroid-compass/APKBUILD
@@ -1,42 +1,39 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-compass
-pkgver=0_git20190721
+pkgver=0_git20210517
pkgrel=0
-_commit="b177e9bd046ce79401931c29a2eb136678047d60"
+_commit="b3cf236b34c386a9cbff81ffc1631554bd60ee1b"
pkgdesc="Default compass app for AsteroidOS"
url="https://github.com/AsteroidOS/asteroid-compass"
-arch="all"
+# armhf blocked by qml-asteroid
+arch="all !armhf"
license="GPL-3.0-or-later"
-depends="mapplauncherd"
+depends="
+ mapplauncherd
+ qt5-qtsensors
+ "
makedepends="
- bash
- grep
+ extra-cmake-modules
qml-asteroid-dev
qt5-qtbase-dev
qt5-qtdeclarative-dev
- qt5-qttools-dev
- qtchooser
- "
-source="https://github.com/AsteroidOS/asteroid-compass/archive/$_commit/asteroid-compass-$_commit.tar.gz
- fix-build.patch
"
+source="https://github.com/AsteroidOS/asteroid-compass/archive/$_commit/asteroid-compass-$_commit.tar.gz"
options="!check" # No tests
builddir="$srcdir/$pkgname-$_commit"
build() {
- qmake-qt5 \
- PREFIX=/usr
- make
-
- i18n/generate-desktop.sh . asteroid-compass.desktop
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cmake --build build
}
package() {
- INSTALL_ROOT="$pkgdir" make install
-
- install -Dm644 asteroid-compass.desktop -t "$pkgdir"/usr/share/applications
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="dffb493161daa20fbd6dcd5567f372c0c8ce40f2a587c7d1afb57e0a42da1be3ea3258916a6c4d94cfb1907d005506b4051663682baf15609d16e7aa2474e5c2 asteroid-compass-b177e9bd046ce79401931c29a2eb136678047d60.tar.gz
-42c992bcba80f1d7e44245bacb45ba20ba231dd94e4d4d0610a96b60b8efeeb56fed98e282f4f40b0cb28649fcdb078a4515b2541ec6c6ce4e6cc2d0c8103e7e fix-build.patch"
+sha512sums="
+707b2ac18101bc6a0252eb691ba30919f9adf4fc59161330972d4b28c32653f4e0ae9c4cd2130d75c99bc0aae4ec1e1bea14fac1a2c7150e3005b7e77f5d4b2d asteroid-compass-b3cf236b34c386a9cbff81ffc1631554bd60ee1b.tar.gz
+"
--
GitLab