Updated package 4kyoutubetomp3 3.8.0.3032-1

3 files changed, 41 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99090a8f9768..28d036e3d4bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = 4kyoutubetomp3
 	pkgdesc = Extract audio from YouTube, Vimeo, Facebook and other online video hosting services.
-	pkgver = 3.7.2.2902
+	pkgver = 3.8.0.3032
 	pkgrel = 1
 	url = http://www.4kdownload.com/products/product-youtubetomp3
 	arch = x86_64
@@ -11,12 +11,14 @@ pkgbase = 4kyoutubetomp3
 	depends = portaudio
 	depends = ffmpeg
 	depends = openssl-1.0
-	source = 4kyoutubetomp3_3.7.2.2902_amd64.tar.bz2::https://dl.4kdownload.com/app/4kyoutubetomp3_3.7.2_amd64.tar.bz2
+	source = 4kyoutubetomp3_3.8.0.3032_amd64.tar.bz2::https://dl.4kdownload.com/app/4kyoutubetomp3_3.8.0_amd64.tar.bz2
 	source = 4kyoutubetomp3.desktop
 	source = 4kyoutubetomp3.png
-	sha256sums = b5e947802466393aec6a92103cd2ab7c497e14fdb8a6c23d77d965f35566495e
+	source = fix_symlink_path.patch
+	sha256sums = 4a54552bcd72c38069e50f334014e562639ce07b52338355746e89cbf6ab28d8
 	sha256sums = 386dfa4085efcd9403c4387c7be4dd0f9762c726555b5ebd0126dcd225bcf828
 	sha256sums = b25f830bb1fe559ea9f0b35cc9eb8ab75e2e40d09b8755f937451f5ddeeec2fd
+	sha256sums = a1316af1c5f93b90cc9791ffb222c1ecec21fa9267bae2f65666e39ed6a960a4
 
 pkgname = 4kyoutubetomp3
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c18ae00fb62..87cf7b7cf373 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Muflone http://www.muflone.com/contacts/english/
 
 pkgname=4kyoutubetomp3
-pkgver=3.7.2.2902
+pkgver=3.8.0.3032
 pkgrel=1
 pkgdesc="Extract audio from YouTube, Vimeo, Facebook and other online video hosting services."
 arch=('x86_64')
@@ -11,15 +11,19 @@ depends=('qt5-script' 'qt5-declarative' 'portaudio' 'ffmpeg' 'openssl-1.0')
 makedepends=('chrpath')
 source=("${pkgname}_${pkgver}_amd64.tar.bz2"::"https://dl.4kdownload.com/app/${pkgname}_${pkgver%.*}_amd64.tar.bz2"
         "${pkgname}.desktop"
-        "${pkgname}.png")
-sha256sums=('b5e947802466393aec6a92103cd2ab7c497e14fdb8a6c23d77d965f35566495e'
+        "${pkgname}.png"
+        "fix_symlink_path.patch")
+sha256sums=('4a54552bcd72c38069e50f334014e562639ce07b52338355746e89cbf6ab28d8'
             '386dfa4085efcd9403c4387c7be4dd0f9762c726555b5ebd0126dcd225bcf828'
-            'b25f830bb1fe559ea9f0b35cc9eb8ab75e2e40d09b8755f937451f5ddeeec2fd')
+            'b25f830bb1fe559ea9f0b35cc9eb8ab75e2e40d09b8755f937451f5ddeeec2fd'
+            'a1316af1c5f93b90cc9791ffb222c1ecec21fa9267bae2f65666e39ed6a960a4')
 
 prepare() {
   cd "${pkgname}"
   # Remove insecure RPATH
   chrpath --delete "${pkgname}-bin"
+  # Fix symlink path
+  patch -p1 -i "${srcdir}/fix_symlink_path.patch"
 }
 
 package() {
@@ -37,9 +41,25 @@ package() {
   install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/audio" audio/*
   install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/translation"
   install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/translation" translation/*
+  # Temporarily ship bundled QT5 libraries as system libraries are unsupported
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "${pkgname}.sh"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Concurrent.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Core.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5DBus.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Gui.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Network.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Qml.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Widgets.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5XcbQpa.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5Xml.so.5"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "libQt5XmlPatterns.so.5"
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/platforms"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/platforms" platforms/*
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/xcbglintegrations"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/xcbglintegrations" xcbglintegrations/*
   # Install launcher file
   install -m 755 -d "${pkgdir}/usr/bin"
-  ln -s "/usr/lib/${pkgname}/${pkgname}-bin" "${pkgdir}/usr/bin/${pkgname}"
+  ln -s "/usr/lib/${pkgname}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
   # Install license file
   install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "doc/eula"
diff --git a/fix_symlink_path.patch b/fix_symlink_path.patch
new file mode 100644
index 000000000000..7ba7ca264054
--- /dev/null
+++ b/fix_symlink_path.patch
@@ -0,0 +1,11 @@
+diff -Naur 4kyoutubetomp3.orig/4kyoutubetomp3.sh 4kyoutubetomp3/4kyoutubetomp3.sh
+--- 4kyoutubetomp3.orig/4kyoutubetomp3.sh	2019-08-29 15:26:34.000000000 +0200
++++ 4kyoutubetomp3/4kyoutubetomp3.sh	2019-09-02 17:09:33.980880550 +0200
+@@ -1,6 +1,6 @@
+  #!/bin/sh
+  
+- SCRIPT_DIR=$(dirname "$0")
++ SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+  SCRIPT_DIR=`cd "$SCRIPT_DIR"; pwd` #make path absolute
+ 
+  LD_LIBRARY_PATH=$SCRIPT_DIR