diff --git a/testing/asteroid-music/APKBUILD b/testing/asteroid-music/APKBUILD index b6592ea847a..4231324a6fb 100644 --- a/testing/asteroid-music/APKBUILD +++ b/testing/asteroid-music/APKBUILD @@ -1,56 +1,37 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=asteroid-music -pkgver=0_git20210220 +pkgver=0_git20210517 pkgrel=0 -_commit="cb4729e5c0f76f79d16ac8d02a7aea70b4f9216d" +_commit="a3a13db9ce31e8a75f339adf36940aa48128fe1a" pkgdesc="Default music app for AsteroidOS" url="https://github.com/AsteroidOS/asteroid-music" -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-music/archive/$_commit/asteroid-music-$_commit.tar.gz - fix-build.patch " +source="https://github.com/AsteroidOS/asteroid-music/archive/$_commit/asteroid-music-$_commit.tar.gz" options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" build() { - qmake-qt5 \ - PREFIX=/usr - make - - i18n/generate-desktop.sh . asteroid-music.desktop - - cd i18n - lrelease -idbased ./*.ts + 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-music.desktop -t "$pkgdir"/usr/share/applications + DESTDIR="$pkgdir" cmake --install build } -lang() { - cd "$builddir"/i18n - find . -name "*.ts" | while read -r i; do - install -Dm644 ${i/ts/qm} -t "$subpkgdir"/usr/share/translations - done -} - -sha512sums="a002d3be77ed819e5312a1c5772669f4460c43292eae2197d3ad1f1b1a1017a7dd9b029be7759ec7e1539a1848cdc00fbe353c2a78ba1a75061d99111af10f95 asteroid-music-cb4729e5c0f76f79d16ac8d02a7aea70b4f9216d.tar.gz -8fc4afe2d5ddda744bb92eb588a95a51a4c4aa2543b954c5aaea8e36b38dfcb22bdab2c9bb2c9142103996461168636a8eaec11c1dbabfe9af0aa85cad7db630 fix-build.patch" +sha512sums=" +96380403afc2192a4c4c7065a5a05ed49d033b8c5d6de0ea4c8d128caca05171f8fbc40e220cef5fb0160988e17787e2d376d0786b70709c1bcdc4435426d1ad asteroid-music-a3a13db9ce31e8a75f339adf36940aa48128fe1a.tar.gz +" diff --git a/testing/asteroid-music/fix-build.patch b/testing/asteroid-music/fix-build.patch deleted file mode 100644 index 0a5b183daf8..00000000000 --- a/testing/asteroid-music/fix-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/asteroid-music.pro b/asteroid-music.pro -index d7724da..9938d1e 100644 ---- a/asteroid-music.pro -+++ b/asteroid-music.pro -@@ -1,5 +1,6 @@ - TARGET = asteroid-music --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/asteroid-music.desktop.h } - TRANSLATIONS = $$files(i18n/$$TARGET.*.ts) -+ -+target.path = /usr/bin/ -+INSTALLS += target