update PKGBUILD, use git master branch

2 files changed, 9 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b53eec2a31ff..fd456ed691be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 
 # Contributor: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=pangolin-desktop-git
-pkgver=dap.sigma.r25.g62fc2b74
+pkgver=r2596.c8763bb4
 pkgrel=1
 epoch=1
 pkgdesc="Preview of Pangolin Desktop UI shell, designed for dahliaOS, written in Flutter."
@@ -9,29 +9,27 @@ arch=('x86_64')
 url="https://github.com/dahliaOS/pangolin_desktop"
 license=('Apache')
 depends=('gtk3')
-makedepends=('git' 'flutter-git' 'cmake' 'ninja' 'imagemagick')
+makedepends=('git' 'flutter>=3.10.0' 'cmake' 'ninja' 'imagemagick' 'clang>=11.0.0')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/dahliaOS/pangolin_desktop.git'
         "${pkgname%-git}.desktop")
 sha256sums=('SKIP'
-            'f9b790200ac34e3dc038b0bc3366d91c08239762466ccc383fc2eb8f03ad2c02')
+            '34a50af02e401b6a88e255018fa0cb3f1fce0c064b33b7ca2ddb97ce90c38241')
 
 pkgver() {
   cd "$srcdir/pangolin_desktop"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
   cd "$srcdir/pangolin_desktop"
-  flutter channel master
-  flutter upgrade
   flutter config --enable-linux-desktop
   flutter build linux
 }
 
 package() {
-  cd "$srcdir/pangolin_desktop/build/linux/release/bundle"
+  cd "$srcdir/pangolin_desktop/build/linux/x64/release/bundle"
   install -d "$pkgdir/opt/${pkgname%-git}"
   cp -r * "$pkgdir/opt/${pkgname%-git}"
 
@@ -39,10 +37,9 @@ package() {
   ln -s "/opt/${pkgname%-git}/pangolin_desktop" "$pkgdir/usr/bin/${pkgname%-git}"
 
   convert \
-    data/flutter_assets/assets/images/logos/dahliaOS-logo.png \
-      -resize 1024 "$srcdir/dahliaOS_logo-1024.png"
-  install -Dm644 "$srcdir/dahliaOS_logo-1024.png" \
+    "$srcdir/pangolin_desktop/assets/images/logos/pangolin.png" \
+      -resize 1024 "$srcdir/pangolin-1024.png"
+  install -Dm644 "$srcdir/pangolin-1024.png" \
     "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
-
   install -Dm644 "$srcdir/${pkgname%-git}.desktop" -t "$pkgdir/usr/share/applications"
 }
diff --git a/pangolin-desktop.desktop b/pangolin-desktop.desktop
index 7853de598be9..4147563d4465 100755
--- a/pangolin-desktop.desktop
+++ b/pangolin-desktop.desktop
@@ -5,4 +5,5 @@ Name=Pangolin Desktop
 Exec=/opt/pangolin-desktop/pangolin_desktop
 Terminal=false
 Hidden=false
+Categories=Utility;
 Comment=Pangolin Desktop UI shell