network/synergy: Updated for version 1.14.3.5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 35 insertions, 86 deletions

diff --git a/network/synergy/010_include_dns_sd.diff b/network/synergy/010_include_dns_sd.diff
deleted file mode 100644
index 535acb9bce..0000000000
--- a/network/synergy/010_include_dns_sd.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/gui.pro.orig	2015-05-27 01:56:21.000000000 +1000
-+++ src/gui/gui.pro	2015-06-09 16:52:57.664552976 +1000
-@@ -4,6 +4,8 @@
- TARGET = synergy
- DEPENDPATH += . \
-     res
-+CONFIG += link_pkgconfig
-+PKGCONFIG += avahi-compat-libdns_sd
- INCLUDEPATH += . \
-     src
- FORMS += res/MainWindowBase.ui \
diff --git a/network/synergy/020_toolchain_commands.diff b/network/synergy/020_toolchain_commands.diff
deleted file mode 100644
index b5fb3fe705..0000000000
--- a/network/synergy/020_toolchain_commands.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- ext/toolchain/commands1.py.orig	2017-03-04 00:05:27.000000000 +1000
-+++ ext/toolchain/commands1.py	2020-02-12 09:12:23.304443034 +1000
-@@ -967,16 +967,17 @@
- 		if sys.version_info < (2, 4):
- 			raise Exception("Python 2.4 or greater required.")
- 
--		p = subprocess.Popen(
--			["git", "log", "--pretty=format:%h", "-n", "1"],
--			stdout=subprocess.PIPE, stderr=subprocess.PIPE)
--
--		stdout, stderr = p.communicate()
--
--		if p.returncode != 0:
--			raise Exception('Could not get revision, git error: ' + str(p.returncode))
--	
--		return stdout.strip()
-+#		p = subprocess.Popen(
-+#			["git", "log", "--pretty=format:%h", "-n", "1"],
-+#			stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+#
-+#		stdout, stderr = p.communicate()
-+#
-+#		if p.returncode != 0:
-+#			raise Exception('Could not get revision, git error: ' + str(p.returncode))
-+#	
-+#		return stdout.strip()
-+                return "1.8.8"
- 
- 	def getGitBranchName(self):
- 		if sys.version_info < (2, 4):
---- src/gui/src/AboutDialog.cpp.orig	2017-03-04 00:05:27.000000000 +1000
-+++ src/gui/src/AboutDialog.cpp	2020-02-12 09:47:52.648113058 +1000
-@@ -29,7 +29,7 @@
- 
- 	m_versionChecker.setApp(synergyApp);
- 	QString version = m_versionChecker.getVersion();
--	version = version + '-' + VERSION_STAGE +  '-' + VERSION_REVISION;
-+	version = version + '-' + VERSION_STAGE;
- 	m_pLabelSynergyVersion->setText(version);
- 
- 	QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified();
diff --git a/network/synergy/030_openssl.diff b/network/synergy/030_openssl.diff
deleted file mode 100644
index 9aefa07d7d..0000000000
--- a/network/synergy/030_openssl.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/net/SecureSocket.cpp.orig	2020-05-06 17:55:18.744800427 -0500
-+++ src/lib/net/SecureSocket.cpp	2020-05-06 17:55:05.529584786 -0500
-@@ -807,7 +807,7 @@
- 
- 	// m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
- 	// of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
--	STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
-+    STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
- 		if (cStack == NULL) {
- 		LOG((CLOG_DEBUG1 "remote cipher list not available"));
- 	}
diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild
index dc58842376..6874d88542 100644
--- a/network/synergy/synergy.SlackBuild
+++ b/network/synergy/synergy.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=synergy
 SRCNAM=synergy-core
-VERSION=${VERSION:-1.8.8}
+VERSION=${VERSION:-1.14.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -76,9 +76,6 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION-stable
 tar xvf $CWD/$SRCNAM-$VERSION-stable.tar.gz
 cd $SRCNAM-$VERSION-stable
-patch -p0 < $CWD/010_include_dns_sd.diff
-patch -p0 < $CWD/020_toolchain_commands.diff
-patch -p0 < $CWD/030_openssl.diff
 
 chown -R root:root .
 find -L . \
@@ -87,29 +84,44 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-
-sh hm.sh configure --generator=1 --release
-CXXFLAGS="$SLKCFLAGS" sh hm.sh build
+#Remove the submodule pugixml
+sed -i.remove-sub-pugixml -e '/pugixml/ s/^/#/' src/lib/synergy/CMakeLists.txt
+sed -i.add-lib-pugixml -e '/target_link_libraries(synlib arch/ s/target_link_libraries(synlib arch \(.*\))/target_link_libraries(synlib arch \1 pugixml)/' src/lib/synergy/CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DBUILD_TESTS=false \
+    -DSYNERGY_VERSION_STAGE:STRING=stable \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 # installation not implemented
 mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 \
 $PKG/usr/share/icons/hicolor/256x256 $PKG/usr/share/applications
 
-for file in synergy synergyc synergyd synergys syntool usynergy ; do
-  install -s -m 0755 $TMP/$SRCNAM-$VERSION-stable/bin/$file $PKG/usr/bin
-done
+#for file in synergy synergyc synergyd synergys syntool usynergy ; do
+#  install -s -m 0755 $TMP/$SRCNAM-$VERSION-stable/bin/$file $PKG/usr/bin
+#done
 
-for file in synergy.conf.example synergy.conf.example-advanced synergy.conf.example-basic ; do
-  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
-done
+#for file in synergy.conf.example synergy.conf.example-advanced synergy.conf.example-basic ; do
+#  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
+#done
 
-for file in COMPILE ChangeLog INSTALL LICENSE README ; do
-  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION
-done
+#for file in COMPILE ChangeLog INSTALL LICENSE README ; do
+#  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION
+#done
 
-for file in synergyc.man synergys.man ; do
-  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1
-done
+#for file in synergyc.man synergys.man ; do
+#  install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1
+#done
 find $PKG/usr/man/man1 -type f -name "*.man" -exec rename '.man' '.1' {} \;
 find $PKG/usr/man/man1 -type f -name "*.?" -exec gzip -9f {} \;
 
diff --git a/network/synergy/synergy.info b/network/synergy/synergy.info
index 495e3aa017..f46cd33125 100644
--- a/network/synergy/synergy.info
+++ b/network/synergy/synergy.info
@@ -1,10 +1,10 @@
 PRGNAM="synergy"
-VERSION="1.8.8"
+VERSION="1.14.3.5"
 HOMEPAGE="http://synergy-project.org/"
-DOWNLOAD="https://github.com/symless/synergy-core/archive/v1.8.8-stable/synergy-core-1.8.8-stable.tar.gz"
-MD5SUM="ad0514cc4dbfbc90aabc75c7ff17f0f3"
+DOWNLOAD="https://github.com/symless/synergy-core/archive/v1.14.3.5-stable/synergy-core-1.14.3.5-stable.tar.gz"
+MD5SUM="ec05db383439cf406a57ab5d18b5d444"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="avahi"
+REQUIRES="avahi pugixml"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"