aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-05-17 14:06:48 +0200
committerBart Ribbers <bribbers@disroot.org>2021-05-17 15:35:01 +0200
commit32257f84b9825f55cddc17ddeef2f4834e6695c4 (patch)
treee361f75048e767ce3e5cec623420122c4e7e8a6d
parentff87c1677d2b82840d96f7a1abfe44949e66b0db (diff)
downloadaports-32257f84b9825f55cddc17ddeef2f4834e6695c4.tar.gz
aports-32257f84b9825f55cddc17ddeef2f4834e6695c4.tar.bz2
aports-32257f84b9825f55cddc17ddeef2f4834e6695c4.tar.xz
testing/asteroid-flashlight: 0_git20210517
-rw-r--r--testing/asteroid-flashlight/APKBUILD35
-rw-r--r--testing/asteroid-flashlight/fix-build.patch19
2 files changed, 15 insertions, 39 deletions
diff --git a/testing/asteroid-flashlight/APKBUILD b/testing/asteroid-flashlight/APKBUILD
index 822821abdc..7c1c73acfb 100644
--- a/testing/asteroid-flashlight/APKBUILD
+++ b/testing/asteroid-flashlight/APKBUILD
@@ -1,45 +1,40 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=asteroid-flashlight
-pkgver=0_git20200410
+pkgver=0_git20210517
pkgrel=0
-_commit="826f1e4448e976fed4e6fce9d9a5bd3bfc799835"
+_commit="967f5c0ef9d312b369138f24beae2c8ae30b0c06"
pkgdesc="Default flashlight app for AsteroidOS"
url="https://github.com/AsteroidOS/asteroid-flashlight"
-arch="all"
+# armhf blocked by qml-asteroid
+arch="all !armhf"
license="GPL-3.0-or-later"
depends="
mapplauncherd
nemo-keepalive
"
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-flashlight/archive/$_commit/asteroid-flashlight-$_commit.tar.gz
- fix-build.patch
"
+source="https://github.com/AsteroidOS/asteroid-flashlight/archive/$_commit/asteroid-flashlight-$_commit.tar.gz"
options="!check" # No tests
builddir="$srcdir/$pkgname-$_commit"
build() {
- qmake-qt5 \
- PREFIX=/usr
- make
-
- i18n/generate-desktop.sh . asteroid-flashlight.desktop
+ cmake -B build \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build build
}
package() {
- INSTALL_ROOT="$pkgdir" make install
-
- install -Dm644 asteroid-flashlight.desktop -t "$pkgdir"/usr/share/applications
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="0f80b2d090a06c0c387d2df5b9a14390a90b2de4cfd86c3d4e0a8df8d9ad0d888be7a25732957acf27d9aa2407d00b7f3087bcddbc4399662f6f820fe7907fb6 asteroid-flashlight-826f1e4448e976fed4e6fce9d9a5bd3bfc799835.tar.gz
-01a12ce877381e963881e63f5881e479f297dfff35ef65f30b98572871f042cfc8704a5291853293fb689a421cca7fcbaa987a77011798cd9fd334ecedf7fcac fix-build.patch"
+sha512sums="
+1a3da1e9b4e2c28f3febc48f2b93bc83a1dfddf3e347c08849e5308591d638b9d92009824f648b526ec492bc2cc6e6d4d64ac353e28be2e569640f59bd5eb948 asteroid-flashlight-967f5c0ef9d312b369138f24beae2c8ae30b0c06.tar.gz
+"
diff --git a/testing/asteroid-flashlight/fix-build.patch b/testing/asteroid-flashlight/fix-build.patch
deleted file mode 100644
index 99198a5b8a..0000000000
--- a/testing/asteroid-flashlight/fix-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/asteroid-flashlight.pro b/asteroid-flashlight.pro
-index e6bd4d2..5e292dc 100644
---- a/asteroid-flashlight.pro
-+++ b/asteroid-flashlight.pro
-@@ -1,5 +1,6 @@
- TARGET = asteroid-flashlight
--CONFIG += asteroidapp
-+CONFIG += asteroidapp link_pkgconfig
-+PKGCONFIG += asteroidapp
-
- SOURCES += main.cpp
- RESOURCES += resources.qrc
-@@ -7,3 +8,6 @@ OTHER_FILES += main.qml
-
- lupdate_only{ SOURCES = i18n/$$TARGET.desktop.h }
- TRANSLATIONS = $$files(i18n/$$TARGET.*.ts)
-+
-+target.path = /usr/bin/
-+INSTALLS += target