[arch-commits] Commit in rbutil/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Friday, August 19, 2022 @ 08:48:32
  Author: alucryd
Revision: 1269699

upgpkg: rbutil 1.5.1-1

Modified:
  rbutil/trunk/PKGBUILD

----------+
 PKGBUILD |   57 +++++++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-19 08:48:31 UTC (rev 1269698)
+++ PKGBUILD	2022-08-19 08:48:32 UTC (rev 1269699)
@@ -3,59 +3,56 @@
 # Contributor: said <atvordhosbn at gmail.com>
 # Contributor: clinx <clinx.hacker at googlemail.com>
 
-_name=rockbox
 pkgname=rbutil
-pkgver=1.4.1.r381.g94eb1df58b
-pkgrel=3
+pkgver=1.5.1
+pkgrel=1
 pkgdesc='Rockbox Utility'
 arch=(x86_64)
 url=https://www.rockbox.org/twiki/bin/view/Main/RockboxUtility
 license=(GPL)
 depends=(
-  crypto++
-  qt5-base
-  qt5-multimedia
-  libxkbcommon-x11
+  gcc-libs
+  glibc
+  libbz2.so
+  libusb-1.0.so
+  qt6-5compat
+  qt6-base
+  qt6-multimedia
+  qt6-svg
   zlib
 )
 makedepends=(
-  gendesk
+  cmake
   git
-  libusb
-  qt5-tools
+  ninja
+  qt6-tools
 )
 optdepends=('speex: voice files support')
-# NOTE: commit with latest Qt fixes
-_commit=94eb1df58b
-# NOTE: using git sources, as the build fails during linking with 1.4.1
-source=("git+https://git.${_name}.org/cgit/${_name}.git#commit=${_commit}")
-sha256sums=('SKIP')
+_tag=f8d54d0d1e8ae891d9da9cf787aa0dd045cc193b
+source=(git+https://git.rockbox.org/cgit/rockbox.git#tag=${_tag})
+b2sums=(SKIP)
 
 prepare() {
-  gendesk -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="Rockbox Utility" --exec="RockboxUtility" --categories="Application;Utility;" --comment="Rockbox automated installer"
+  sed '/add_subdirectory(themeeditor)/d' -i rockbox/utils/CMakeLists.txt
 }
 
 pkgver() {
-  cd "${_name}"
-  git describe --long --exclude '*archos_retired*' --tags | sed 's/\([^-]*-g\)/r\1/;s/rbutil_//;s/-/./g'
+  cd rockbox
+  git describe --tags | sed 's/rbutil_//'
 }
 
 build() {
-  cd "${_name}/${pkgname}/rbutilqt"
-
-  lrelease-qt5 rbutilqt.pro
-  qmake-qt5
-  make
+  cmake -S rockbox/utils -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -Wno-dev
+  cmake --build build
 }
 
 package(){
-  depends+=('libusb-1.0.so')
-  cd "${_name}/${pkgname}/rbutilqt"
-
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
-  install -m 755 {,"${pkgdir}"/usr/bin/}RockboxUtility
-  install -m 644 icons/rockbox-256.png "${pkgdir}"/usr/share/pixmaps/rbutil.png
-  install -m 644 {"${srcdir}","${pkgdir}"/usr/share/applications}/rbutil.desktop
+  install -Dm 755 build/rbutilqt/RockboxUtility -t "${pkgdir}"/usr/bin/
+  install -Dm 644 rockbox/utils/rbutilqt/RockboxUtility.desktop -t "${pkgdir}"/usr/share/applications/
+  install -Dm 644 rockbox/docs/logo/rockbox-clef.svg -t "${pkgdir}"/usr/share/pixmaps/
 }
 
 # vim: ts=2 sw=2 et: