From b940cff8e63331c2d846d7d9445dfda65d6be644 Mon Sep 17 00:00:00 2001
From: creations <creations@creations.works>
Date: Tue, 28 Jan 2025 23:28:53 -0500
Subject: [PATCH] move to latest, and to navithingy-git

---
 .SRCINFO   | 66 +++++++++++++++++++++++++++---------------------------
 .gitignore |  2 +-
 PKGBUILD   | 27 +++++++++++++---------
 3 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d0af53f..3b9cbfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,34 @@
 pkgbase = navithingy
-	pkgdesc = A Navidrome client built with Tauri and Svelte.
-	pkgver = 0.2.0
-	pkgrel = 1
-	url = https://github.com/vMohammad24/NaviThingy
-	arch = x86_64
-	license = MIT
-	depends = nodejs
-	depends = npm
-	depends = gtk3
-	depends = gstreamer
-	depends = gst-plugins-base
-	depends = gst-plugins-good
-	depends = gst-plugins-bad
-	depends = gst-plugins-ugly
-	makedepends = git
-	makedepends = nodejs
-	makedepends = npm
-	makedepends = rustup
-	makedepends = pkg-config
-	makedepends = clang
-	makedepends = lld
-	makedepends = webkit2gtk-4.1
-	makedepends = openssl
-	makedepends = openssl-1.1
-	makedepends = fuse2
-	makedepends = glib2
-	makedepends = zlib
-	makedepends = patchelf
-	optdepends = libappindicator-gtk3: System tray support
-	optdepends = gst-plugin-pipewire: Required for PipeWire-based audio playback
-	source = git+https://github.com/vMohammad24/NaviThingy.git#tag=NaviThingy0.2.0
-	sha256sums = SKIP
-	install = navithingy.install
+pkgdesc = A Navidrome client built with Tauri and Svelte.
+pkgver = 0.2.0
+pkgrel = 1
+url = https://github.com/vMohammad24/NaviThingy
+arch = x86_64
+license = MIT
+depends = nodejs
+depends = npm
+depends = gtk3
+depends = gstreamer
+depends = gst-plugins-base
+depends = gst-plugins-good
+depends = gst-plugins-bad
+depends = gst-plugins-ugly
+makedepends = git
+makedepends = nodejs
+makedepends = npm
+makedepends = rustup
+makedepends = pkg-config
+makedepends = clang
+makedepends = lld
+makedepends = webkit2gtk-4.1
+makedepends = openssl
+makedepends = openssl-1.1
+makedepends = fuse2
+makedepends = glib2
+makedepends = zlib
+makedepends = patchelf
+optdepends = libappindicator-gtk3: System tray support
+optdepends = gst-plugin-pipewire: Required for PipeWire-based audio playback
+source = git+https://github.com/vMohammad24/NaviThingy.git
+sha256sums = SKIP
+install = navithingy.install
diff --git a/.gitignore b/.gitignore
index dfeabb4..bb6f28c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 src
 pkg
-navithingy
+NaviThingy
 navithingy-*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 170e9be..9bc2393 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,34 @@
 # Maintainer: creations <creations@creations.works>
-pkgname=navithingy
+pkgname=navithingy-git
 pkgver=0.2.0
 pkgrel=1
-pkgdesc="A Navidrome client built with Tauri and Svelte. "
+pkgdesc="A Navidrome client built with Tauri and Svelte."
 arch=('x86_64')
 url="https://github.com/vMohammad24/NaviThingy"
 license=('MIT')
 depends=('nodejs' 'npm' 'gtk3' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly')
 makedepends=('git' 'nodejs' 'npm' 'rustup' 'pkg-config' 'clang' 'lld' 'webkit2gtk-4.1' 'openssl' 'openssl-1.1' 'glib2' 'zlib' 'patchelf')
-source=("$pkgname::git+https://github.com/vMohammad24/NaviThingy.git#tag=NaviThingy$pkgver")
+source=("git+https://github.com/vMohammad24/NaviThingy.git")
 sha256sums=('SKIP')
 install="$pkgname.install"
 
+pkgver() {
+    cd "$srcdir/NaviThingy"
+    git describe --tags --abbrev=0 | sed 's/^NaviThingy//'
+}
+
 prepare() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/NaviThingy"
 
     rustup default stable
     rustup update stable
     rustup target add x86_64-unknown-linux-gnu
-    
+
     npm install
 }
 
 build() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/NaviThingy"
 
     export RUSTFLAGS="-C link-arg=-fuse-ld=lld"
     export CC=clang
@@ -34,7 +39,7 @@ build() {
 }
 
 package() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/NaviThingy"
     install -d "$pkgdir/usr/bin"
     install -d "$pkgdir/usr/share/applications"
     install -d "$pkgdir/usr/share/icons/hicolor"
@@ -51,9 +56,9 @@ Categories=Audio;Music;
 EOF
 
     # Install icons
-    if [ -d "$srcdir/$pkgname/static" ]; then
-        install -Dm644 "$srcdir/$pkgname/static/favicon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/navithingy.png"
-        install -Dm644 "$srcdir/$pkgname/static/logo.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/navithingy.svg"
+    if [ -d "$srcdir/NaviThingy/static" ]; then
+        install -Dm644 "$srcdir/NaviThingy/static/favicon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/navithingy.png"
+        install -Dm644 "$srcdir/NaviThingy/static/logo.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/navithingy.svg"
     fi
 }
 
@@ -64,6 +69,6 @@ optdepends=(
 
 check() {
     echo "Skipping check() due to svelte-check issue."
-    # cd "$srcdir/$pkgname"
+    # cd "$srcdir/NaviThingy"
     # npm run check
 }