Update to 1.1.8

3 files changed, 29 insertions, 11 deletions

diff --git a/sysutils/synergy/files/patch-CArchNetworkBSD.cpp b/sysutils/synergy/files/patch-CArchNetworkBSD.cpp
new file mode 100644
index 000000000000..0173cf1196a7
--- /dev/null
+++ b/sysutils/synergy/files/patch-CArchNetworkBSD.cpp
@@ -0,0 +1,19 @@
+--- lib/arch/CArchNetworkBSD.cpp.orig	Wed Sep  1 13:52:08 2004
++++ lib/arch/CArchNetworkBSD.cpp	Wed Sep  1 13:52:31 2004
+@@ -50,7 +50,6 @@
+ #if HAVE_ALLOCA_H
+ #	define freea(x_)
+ #else
+-#	define alloca(x_) malloc(x_)
+ #	define freea(x_) free(x_)
+ #endif
+ 
+@@ -292,7 +291,7 @@
+ 
+ 	// allocate space for translated query
+ 	struct pollfd* pfd = reinterpret_cast<struct pollfd*>(
+-								alloca((1 + num) * sizeof(struct pollfd)));
++								malloc((1 + num) * sizeof(struct pollfd)));
+ 
+ 	// translate query
+ 	for (int i = 0; i < num; ++i) {
diff --git a/sysutils/synergy/files/patch-CXWindowsScreen.cpp b/sysutils/synergy/files/patch-CXWindowsScreen.cpp
deleted file mode 100644
index 713ac6fe6e01..000000000000
--- a/sysutils/synergy/files/patch-CXWindowsScreen.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/platform/CXWindowsScreen.cpp.orig	Sun Jul 20 09:21:19 2003
-+++ lib/platform/CXWindowsScreen.cpp	Fri Oct 17 14:28:26 2003
-@@ -293,7 +293,7 @@
- 			}
- 		}
- #if HAVE_POLL
--		int timeout = static_cast<int>(1000.0 * dtimeout);
-+		int timeout = (dtimeout < 0) ? -1 :  static_cast<int>(1000.0 * dtimeout);
- #else
- 		struct timeval timeout;
- 		struct timeval* timeoutPtr;
diff --git a/sysutils/synergy/files/patch-IPlatformScreen.h b/sysutils/synergy/files/patch-IPlatformScreen.h
new file mode 100644
index 000000000000..7ddf753eb915
--- /dev/null
+++ b/sysutils/synergy/files/patch-IPlatformScreen.h
@@ -0,0 +1,10 @@
+--- lib/synergy/IPlatformScreen.h.orig	Wed Sep  1 13:56:16 2004
++++ lib/synergy/IPlatformScreen.h	Wed Sep  1 13:56:47 2004
+@@ -171,7 +171,6 @@
+ 						getActiveModifiers() const = 0;
+ 	virtual const char*	getKeyName(KeyButton) const = 0;
+ 
+-protected:
+ 	//! Handle system event
+ 	/*!
+ 	A platform screen is expected to install a handler for system