soulseekqt: reverted to AppImage extraction

3 files changed, 31 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b565c3c5c1ef..f3d62c32a366 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = soulseekqt
 	pkgdesc = A desktop client for the Soulseek peer-to-peer file sharing network
 	pkgver = 20180130
-	pkgrel = 7
+	pkgrel = 8
 	url = http://www.soulseekqt.net/news/
 	arch = x86_64
 	license = CUSTOM
@@ -14,7 +14,7 @@ pkgbase = soulseekqt
 	source = soulseekqt.desktop
 	md5sums = 1d98331893bc9b9d45ba34f6523353ab
 	md5sums = 4ed42be654289fc9cd7f4181c363f745
-	md5sums = 81470652eeabc4f8a51443d1c22f079f
+	md5sums = cdc28ff969333f5ef009dfa73c214efc
 	md5sums = 2544611108889c2c4c7a9084672f4d32
 
 pkgname = soulseekqt
diff --git a/PKGBUILD b/PKGBUILD
index 68ff4fe81317..f86d1f90517a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=soulseekqt
 pkgver=20180130
 _pkgver=2018-1-30
-pkgrel=7
+pkgrel=8
 pkgdesc="A desktop client for the Soulseek peer-to-peer file sharing network"
 arch=('x86_64')
 url="http://www.soulseekqt.net/news/"
@@ -14,30 +14,37 @@ license=('CUSTOM')
 depends=('freetype2')
 makedepends=('gcc')
 source=("https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${_pkgver}-64bit-appimage.tgz"
-	selinux-mock.c
-	soulseekqt.sh
-	$pkgname.desktop
+    selinux-mock.c
+    soulseekqt.sh
+    $pkgname.desktop
 )
 options=("!strip")
 
-package () {
-	cd $srcdir
-
-	msg2 "Extraction..."
-	./SoulseekQt-${_pkgver}-64bit.AppImage  --appimage-extract
-
-	msg2 "Compiling libselinux.so.1 fakelib"
-	gcc -s -shared -o libselinux.so.1 -Wl,-soname,libselinux.so.1 selinux-mock.c
+prepare() {
+    cd $srcdir
+    msg2 "Extraction..."
+    ./SoulseekQt-${_pkgver}-64bit.AppImage  --appimage-extract
+    
+    msg2 "Compiling libselinux.so.1 fakelib"
+    gcc -s -shared -o libselinux.so.1 -Wl,-soname,libselinux.so.1 selinux-mock.c
+}
 
-	msg2 "Installing assets..."
-	install -vDm755	"SoulseekQt-${_pkgver}-64bit.AppImage" "$pkgdir/opt/soulseekqt/$pkgname.AppImage"
-	install -vDm755 libselinux.so.1 "$pkgdir/opt/soulseekqt/libselinux.so.1"
-	install -vDm755 soulseekqt.sh "$pkgdir/usr/bin/$pkgname"
-	install -vDm644 squashfs-root/soulseek.png "$pkgdir/usr/share/pixmaps/soulseek.png"
-	install -vDm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+package() {
+    cd $srcdir
+    mkdir -p $pkgdir/opt/
+    cp -r squashfs-root $pkgdir/opt/$pkgname
+    install -vDm755 soulseekqt.sh "$pkgdir/usr/bin/$pkgname"
+    install -vDm755 libselinux.so.1 "$pkgdir/opt/soulseekqt/lib/libselinux.so.1"
+    install -vDm644 squashfs-root/soulseek.png "$pkgdir/usr/share/pixmaps/soulseek.png"
+    install -vDm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    
+    msg2 "Cleanup"
+    chmod 755 -R $pkgdir/opt/$pkgname
+    rm $pkgdir/opt/$pkgname/lib/libfreetype.so.6
+    rm -rf $pkgdir/opt/soulseekqt/{AppRun,default.desktop,soulseek.png,*.AppImage}
 }
 
 md5sums=('1d98331893bc9b9d45ba34f6523353ab'
          '4ed42be654289fc9cd7f4181c363f745'
-         '81470652eeabc4f8a51443d1c22f079f'
+         'cdc28ff969333f5ef009dfa73c214efc'
          '2544611108889c2c4c7a9084672f4d32')
diff --git a/soulseekqt.sh b/soulseekqt.sh
index 46f25ad6abe7..82f6e14d28fa 100644
--- a/soulseekqt.sh
+++ b/soulseekqt.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-QT_QPA_PLATFORM=xcb \
-LD_PRELOAD=/usr/lib/libfreetype.so.6 \
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/soulseekqt \
-/opt/soulseekqt/soulseekqt.AppImage
+cd /opt/soulseekqt
+LD_LIBRARY_PATH=/opt/soulseekqt/lib \
+./SoulseekQt