add ignacio's fix for usage with kde

5 files changed, 56 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cd62764dc3c..ce2d7af55ae1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qsync
 	pkgdesc = QNap's synchronization client
 	pkgver = 1.0.5.0305
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://www.qnap.com/en/utilities/essentials
 	arch = x86_64
@@ -9,8 +9,12 @@ pkgbase = qsync
 	optdepends = nautilus: this client has nautlius integration
 	source = qsync-1.0.5.0305.deb::https://download.qnap.com/Storage/Utility/QNAPQsyncClientUbuntux64-1.0.5.0305.deb
 	source = kde-open5
+	source = Qsync.sh.patch
+	source = QsyncRestart.sh.patch
 	md5sums = 9c34cb93a86e1d3364c12a4a1270232d
-	md5sums = 8ae7948a1de080bd0320c9b126c91075
+	md5sums = ef5abc8367e97f42313bb4545d6acadf
+	md5sums = 923af1881c03c429c4623305d108a5b5
+	md5sums = cfa6be2d8391bde792381740542176b2
 
 pkgname = qsync
 
diff --git a/PKGBUILD b/PKGBUILD
index a1b0c89f2822..c5ad4c2e9f7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Jean Finas <jean@finas.io>
+# Contributer: Ignacio Felipe <djkork@gmail.com>
 pkgname=qsync
 pkgver=1.0.5.0305
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="QNap's synchronization client"
 url="https://www.qnap.com/en/utilities/essentials"
@@ -10,10 +11,18 @@ license=('custom')
 optdepends=('nautilus: this client has nautlius integration')
 changelog=
 source=("${pkgname}-${pkgver}.deb::https://download.qnap.com/Storage/Utility/QNAPQsyncClientUbuntux64-${pkgver}.deb"
-	'kde-open5')
+	'kde-open5'
+    'Qsync.sh.patch'
+    'QsyncRestart.sh.patch'
+    )
+
+
 noextract=()
 md5sums=('9c34cb93a86e1d3364c12a4a1270232d'
-	'8ae7948a1de080bd0320c9b126c91075')
+    'ef5abc8367e97f42313bb4545d6acadf'
+    '923af1881c03c429c4623305d108a5b5'
+    'cfa6be2d8391bde792381740542176b2'
+    )
 
 package() {
 	cd $srcdir
@@ -24,4 +33,8 @@ package() {
 
 	install -D -m 755 -o root "${srcdir}/kde-open5" "${pkgdir}/usr/local/bin/kde-open5"
 
+    qnapdir="${pkgdir}/usr/local/bin/QNAP/QsyncClient"
+    patch "${qnapdir}/Qsync.sh" < "${srcdir}/Qsync.sh.patch"
+    patch "${qnapdir}/QsyncRestart.sh" < "${srcdir}/QsyncRestart.sh.patch"
+
 }
diff --git a/Qsync.sh.patch b/Qsync.sh.patch
new file mode 100644
index 000000000000..0a165069f5b4
--- /dev/null
+++ b/Qsync.sh.patch
@@ -0,0 +1,18 @@
+--- Qsync.sh	2020-03-05 06:57:56.000000000 +0100
++++ Qsync.sh	2020-06-21 22:00:00.000000000 +0200
+@@ -1,6 +1,5 @@
+ #!/bin/bash
+ 
+-#!/bin/sh
+ 
+ ulimit -n 4096
+ 
+@@ -13,5 +12,7 @@
+ dirname=$PWD/$dirname
+ fi
+ LD_LIBRARY_PATH="$dirname/lib"
+-export LD_LIBRARY_PATH=/usr/local/lib/QNAP/QsyncClient
++export LD_LIBRARY_PATH=/usr/local/lib/QNAP/QsyncClient:/usr/lib:$LD_LIBRARY_PATH
++export PATH=$dirname:$PATH
++
+ $dirname/$appname "$@"
diff --git a/QsyncRestart.sh.patch b/QsyncRestart.sh.patch
new file mode 100644
index 000000000000..8fb48446e4b7
--- /dev/null
+++ b/QsyncRestart.sh.patch
@@ -0,0 +1,9 @@
+--- QsyncRestart.sh	2020-03-05 06:57:56.000000000 +0100
++++ QsyncRestart.sh	2020-06-21 22:00:00.000000000 +0200
+@@ -19,4 +19,6 @@
+ fi
+ LD_LIBRARY_PATH="$dirname/lib"
+ export LD_LIBRARY_PATH=/usr/local/lib/QNAP/QsyncClient
++export PATH=$dirname:$PATH
++
+ $dirname/Qsync "$@"
diff --git a/kde-open5 b/kde-open5
index 7d86e9c90ef0..f3f81d321b68 100755
--- a/kde-open5
+++ b/kde-open5
@@ -1,3 +1,7 @@
-#!/bin/bash    
-export LD_LIBRARY_PATH=/usr/lib
-/usr/bin/kde-open5 $@
+#!/bin/bash
+
+QTLIBS_PATH=`pkg-config --variable=libdir Qt5Core`
+QTBIN_PATH=`pkg-config --variable=host_bins Qt5Core`
+
+export LD_LIBRARY_PATH=${QTLIBS_PATH}:${LD_LIBRARY_PATH}
+${QTBIN_PATH}/kde-open5 $@