chore: build .deb and use .desktop from it

4 files changed, 11 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56bf771cc281..51a69aeda926 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = elk-zone-git
 	pkgdesc = Native version of Elk, a nimble Mastodon web client.
-	pkgver = r187.55080d2
+	pkgver = r191.73fd12c
 	pkgrel = 1
 	url = https://github.com/elk-zone/elk-native
 	arch = any
@@ -18,17 +18,14 @@ pkgbase = elk-zone-git
 	makedepends = librsvg
 	makedepends = libvips
 	makedepends = git
+	makedepends = npm
+	makedepends = binutils
 	depends = webkit2gtk
 	depends = gtk3
 	depends = libappindicator-gtk3
 	depends = librsvg
 	depends = libvips
 	source = elk-zone-git::git+https://github.com/elk-zone/elk-native.git
-	source = elk-zone.desktop
-	source = elk-zone.desktop.sig
-	validpgpkeys = 11967103FD525D8611D25DB2654D7FAA1531BC24
-	sha256sums = SKIP
-	sha256sums = 0bf937c26ee016cf3592c2e574778bf827f9d6d795e03bf068b56f09a38c58fe
 	sha256sums = SKIP
 
 pkgname = elk-zone-git
diff --git a/PKGBUILD b/PKGBUILD
index d1340c3c6751..32a90f04ca08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,16 @@
 pkgname='elk-zone-git'
 pkgdesc='Native version of Elk, a nimble Mastodon web client.'
 url='https://github.com/elk-zone/elk-native'
-pkgver=r187.55080d2
+pkgver=r191.73fd12c
 pkgrel=1
 arch=('any')
 license=('MIT')
 
-makedepends=('rust' 'cargo' 'cargo-tauri' 'pnpm' 'jq' 'openssl' 'appmenu-gtk-module' 'webkit2gtk' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips' 'git')
+makedepends=('rust' 'cargo' 'cargo-tauri' 'pnpm' 'jq' 'openssl' 'appmenu-gtk-module' 'webkit2gtk' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips' 'git' 'npm' 'binutils')
 depends=('webkit2gtk' 'gtk3' 'libappindicator-gtk3' 'librsvg' 'libvips')
 
-source=("$pkgname::git+https://github.com/elk-zone/elk-native.git"
-        elk-zone.desktop{,.sig})
-sha256sums=('SKIP'
-            '0bf937c26ee016cf3592c2e574778bf827f9d6d795e03bf068b56f09a38c58fe'
-            'SKIP')
-validpgpkeys=('11967103FD525D8611D25DB2654D7FAA1531BC24')
+source=("$pkgname::git+https://github.com/elk-zone/elk-native.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "$pkgname"
@@ -34,12 +30,12 @@ build() {
 
   # Disable updater and only build the executable
   echo "$(cat src-tauri/tauri.conf.json | jq 'del(.tauri.updater)')" > src-tauri/tauri.conf.json
-  echo "$(cat src-tauri/tauri.conf.json | jq '.tauri.bundle.active = false')" > src-tauri/tauri.conf.json
+  echo "$(cat src-tauri/tauri.conf.json | jq '.tauri.bundle.targets = "deb"')" > src-tauri/tauri.conf.json
   cargo tauri build
 }
 
 package() {
-  install -Dm775 elk-zone-git/target/release/elk "$pkgdir"/usr/bin/elk-zone
-  install -Dm755 elk-zone-git/logo-dev.png "$pkgdir"/usr/share/icons/elk-zone.png
-  install -Dm755 elk-zone.desktop "$pkgdir"/usr/share/applications/elk-zone.desktop
+  ar x elk-zone-git/target/release/bundle/deb/elk_*.deb
+
+  tar -zxvf ./data.tar.gz -C "$pkgdir"
 }
diff --git a/elk-zone.desktop b/elk-zone.desktop
deleted file mode 100644
index 89cfba434378..000000000000
--- a/elk-zone.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Elk Zone
-Comment=A nimble Mastodon web client
-Exec=/usr/bin/elk-zone
-Icon=/usr/share/icons/elk-zone.png
-Terminal=false
-Categories=Network;InstantMessaging
-X-Desktop-File-Install-Version=0.26
diff --git a/elk-zone.desktop.sig b/elk-zone.desktop.sig
deleted file mode 100644
index f01d03103c0f..000000000000
--- a/elk-zone.desktop.sig
+++ /dev/null