\aug-01-2018/ possible other fix for partial

3 files changed, 27 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19f904602867..ff71c1aefb0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = synergy2-bin
 	pkgdesc = Keyboard and mouse sharing solution. Synergy allows you to share one mouse and keyboard between multiple computers. Work seamlessly across Windows, macOS and Linux.
-	pkgver = 2.0.3.stable~b1125+8a08e664
+	pkgver = 2.0.12.beta
 	pkgrel = 1
 	url = https://symless.com/synergy
 	install = synergy2-bin.install
@@ -19,12 +19,16 @@ pkgbase = synergy2-bin
 	depends = qt5-base>=5.5.0
 	depends = qt5-declarative>=5.5.0
 	depends = qt5-quickcontrols>=5.5.0
+	depends = qt5-svg>=5.5.0
 	conflicts = synergy
-	conflicts = synergy2-bin
+	conflicts = synergy2
+	conflicts = synergy2-beta
 	options = !strip
 	options = !emptydirs
-	source_x86_64 = https://www.dropbox.com/s/t00chh9rgvo94pf/synergy_2.0.3.stable_b1125%2B8a08e664_amd64.deb?dl=1
-	sha512sums_x86_64 = 08dfd4c5c79af4504fc034c7bb811e19011f86a3e00557f378bebe305406120a1f32d1d06e8dfc6cc76092d1a8b7f88e1b4802f7706a6037ed0c9b562ff9d88c
+	source_x86_64 = https://binaries.symless.com/v2.0.12/debian/synergy_2.0.12.beta~b74%2B0b61673b_amd64.deb
+	source_x86_64 = https://gist.githubusercontent.com/JAicewizard/a70388a3a7c52fef21299f961a652364/raw
+	sha512sums_x86_64 = bd6b20abdf50dac7a475551de8def90ce1a53245adc879ed989873dfbe9b4bfbb4ba4d523745ef39db37d3bec5c80942e9051bfba8b9dd03c7db3dfacd0edbc4
+	sha512sums_x86_64 = 9c818d4f4929d156a6926336048cab4e398047037f45a177cdb71ede9c54d7b16992b7e5437999b2c72d3604c22092790e112abb234647abb0b34adf8e56b76b
 
 pkgname = synergy2-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index a7c696477794..ba790ccfca14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,32 @@
 # Maintainer: jaap
 # Contributor: jaap
 pkgname=synergy2-bin
-pkgver=2.0.3.stable~b1125+8a08e664
+pkgver=2.0.12.beta
 pkgrel=1
 pkgdesc="Keyboard and mouse sharing solution. Synergy allows you to share one mouse and keyboard between multiple computers. Work seamlessly across Windows, macOS and Linux."
 arch=('x86_64')
 url="https://symless.com/synergy"
 license=('unknown')
 groups=('')
-depends=('gcc>=5.2' 'bash-completion>=1.18.' 'gcc-libs>=3.0' 'hicolor-icon-theme' 'openssl-1.0' 'libx11>=1.2.99.901' 'libxext' 'libxi>=1.2.99.4' 'libxtst' 'openssl-1.0>=1.0.0' 'qt5-base>=5.5.0' 'qt5-declarative>=5.5.0' 'qt5-quickcontrols>=5.5.0')
-conflicts=('synergy' 'synergy2-bin')
+depends=('gcc>=5.2' 'bash-completion>=1.18.' 'gcc-libs>=3.0' 'hicolor-icon-theme' 'openssl-1.0' 'libx11>=1.2.99.901' 'libxext' 'libxi>=1.2.99.4' 'libxtst' 'openssl-1.0>=1.0.0' 'qt5-base>=5.5.0' 'qt5-declarative>=5.5.0' 'qt5-quickcontrols>=5.5.0' 'qt5-svg>=5.5.0')
+conflicts=('synergy' 'synergy2' 'synergy2-beta')
 options=('!strip' '!emptydirs')
-install=${pkgname}.install
-source_x86_64=("https://www.dropbox.com/s/t00chh9rgvo94pf/synergy_2.0.3.stable_b1125%2B8a08e664_amd64.deb?dl=1")
-sha512sums_x86_64=('08dfd4c5c79af4504fc034c7bb811e19011f86a3e00557f378bebe305406120a1f32d1d06e8dfc6cc76092d1a8b7f88e1b4802f7706a6037ed0c9b562ff9d88c')
+install=${pkgname}.install 
+source_x86_64=("https://binaries.symless.com/v2.0.12/debian/synergy_2.0.12.beta~b74%2B0b61673b_amd64.deb" "https://gist.githubusercontent.com/JAicewizard/a70388a3a7c52fef21299f961a652364/raw/95f597b0ea42321efa4a0f2395fc84b0fdaf8084/synergy.service")
+sha512sums_x86_64=("bd6b20abdf50dac7a475551de8def90ce1a53245adc879ed989873dfbe9b4bfbb4ba4d523745ef39db37d3bec5c80942e9051bfba8b9dd03c7db3dfacd0edbc4" "8527f4d1dbeead91d694221711a2f64f585c12657fd081f6e3f8c1ed751159d42fdacfac5234a5d039fb911d006acd9924b1413de3054ca05bba8321c094811a")
 
 package(){
-
 	# Extract package data
 	tar xf data.tar.xz -C "${pkgdir}"
-
+	cat "synergy.service"
+	mv "synergy.service" "${pkgdir}/lib/systemd/system/synergy.service"
 	# Fix directories structure differencies
 	cd "${pkgdir}"
 
 	install -D -m644 "${pkgdir}/usr/share/doc/synergy/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	mkdir -p usr/lib 2> /dev/null; cp -r lib/* usr/lib; rm -rf lib
-
+	sed -i "s/{DISPLAY}/${DISPLAY}/g" "${pkgdir}/usr/lib/systemd/system/synergy.service"
+	sed -i "s/{XAUTHORITY}/${XAUTHORITY//\//\\/}/g" "${pkgdir}/usr/lib/systemd/system/synergy.service"
+	cat ${pkgdir}/usr/lib/systemd/system/synergy.service
 	cd ..
-	tput setaf 1; echo "this is the beta package for the AUR, if you want to move to the stable builds go and download the synergy2 package. and make sure to remove this one."; tput sgr0
 }
diff --git a/synergy2-bin.install b/synergy2-bin.install
index 0b39ae387696..b8a43c344b01 100644
--- a/synergy2-bin.install
+++ b/synergy2-bin.install
@@ -3,13 +3,14 @@ post_install() {
 	chmod 777 /var/lib/synergy
 	chmod 777 /etc/synergy
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	
-	systemctl enable synergy.service >/dev/null || true
-	
-	if [ -d /run/systemd/system ]; then
-		systemctl --system daemon-reload >/dev/null || true
-		systemctl start synergy.service >/dev/null || true
+	if [ "upgrade" != $1 ]; then
+		systemctl enable synergy.service >/dev/null || true
+		if [ -d /run/systemd/system ]; then
+			systemctl --system daemon-reload >/dev/null || true
+			systemctl restart synergy.service >/dev/null || true
+		fi
 	fi
+
 	if which update-icon-caches >/dev/null 2>&1 ; then
 		update-icon-caches /usr/share/icons/synergy.svg
 	fi
@@ -17,7 +18,7 @@ post_install() {
 }
 
 post_upgrade() {
-	post_install
+	post_install "upgrade"
 }
 
 pre_remove() {