use upstream install routine

3 files changed, 9 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7a1cd6071ec..b3c99201a3fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = soundux-git
 	pkgdesc = A cross-platform soundboard
-	pkgver = r424.db04167
-	pkgrel = 2
+	pkgver = r609.556c382
+	pkgrel = 3
 	epoch = 1
 	url = https://github.com/Soundux/Soundux
 	arch = any
@@ -14,8 +14,6 @@ pkgbase = soundux-git
 	provides = soundux
 	conflicts = soundux
 	source = git+https://github.com/Soundux/Soundux.git
-	source = soundux.desktop
 	sha256sums = SKIP
-	sha256sums = 9ba572406c69e23c43ae419fde2bcefb4eade15e4e8ed9c082324b11d7e35184
 
 pkgname = soundux-git
diff --git a/PKGBUILD b/PKGBUILD
index 68a2bb49d6f7..d10e78974e47 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Nico <d3sox at protonmail dot com>
 pkgname=soundux-git
-pkgver=r424.db04167
-pkgrel=2
+pkgver=r609.556c382
+pkgrel=3
 epoch=1
 pkgdesc="A cross-platform soundboard"
 arch=('any')
@@ -11,8 +11,8 @@ depends=('pulseaudio' 'webkit2gtk')
 makedepends=('git' 'cmake' 'ninja')
 conflicts=('soundux')
 provides=('soundux')
-source=("git+https://github.com/Soundux/Soundux.git" "soundux.desktop")
-sha256sums=('SKIP' '9ba572406c69e23c43ae419fde2bcefb4eade15e4e8ed9c082324b11d7e35184')
+source=("git+https://github.com/Soundux/Soundux.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/Soundux"
@@ -31,15 +31,9 @@ build() {
 }
 
 package() {
-  # install binary
-  install -Dm 755 "${srcdir}/Soundux/build/soundux" "${pkgdir}/opt/soundux/soundux"
+  cd "${srcdir}/Soundux/build"
+  DESTDIR="$pkgdir/" ninja install
+  # install binary symlink
   mkdir -p "${pkgdir}/usr/bin/"
   ln -sf /opt/soundux/soundux "${pkgdir}/usr/bin/soundux"
-  # install dist
-  mkdir -p "${pkgdir}/opt/soundux/dist"
-  cp -r "${srcdir}/Soundux/build/dist"/* "${pkgdir}/opt/soundux/dist"
-  # install icon
-  install -Dm 664 "${srcdir}/Soundux/assets/icon.png" "${pkgdir}/usr/share/pixmaps/soundux.png"
-  # install desktop file
-  install -Dm 644 "${srcdir}/soundux.desktop" "${pkgdir}/usr/share/applications/soundux.desktop"
 }
diff --git a/soundux.desktop b/soundux.desktop
deleted file mode 100755
index 37cb46ab6908..000000000000
--- a/soundux.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Soundux
-GenericName=Soundboard
-Exec=/opt/soundux/soundux
-Icon=soundux
-Terminal=false
-Categories=Audio;Music;Player;AudioVideo;
-Comment=A universal soundboard using pulseaudio modules