rpms/synergy-plus/EL-5 synergy-plus-1.3.4-xinitthreads.patch, NONE, 1.1 synergy-plus.spec, 1.1, 1.2

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/synergy-plus/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13141/EL-5

Modified Files:
	synergy-plus.spec 
Added Files:
	synergy-plus-1.3.4-xinitthreads.patch 
Log Message:
Disable XInitThreads() on RHEL to fix hang (upstream #194).


synergy-plus-1.3.4-xinitthreads.patch:
 CXWindowsScreen.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE synergy-plus-1.3.4-xinitthreads.patch ---
diff -Naupr synergy-plus-1.3.4.orig/lib/platform/CXWindowsScreen.cpp synergy-plus-1.3.4/lib/platform/CXWindowsScreen.cpp
--- synergy-plus-1.3.4.orig/lib/platform/CXWindowsScreen.cpp	2009-07-21 22:28:40.000000000 +0200
+++ synergy-plus-1.3.4/lib/platform/CXWindowsScreen.cpp	2009-11-24 20:13:42.241195684 +0100
@@ -105,10 +105,11 @@ CXWindowsScreen::CXWindowsScreen(const c
 	s_screen = this;
 	
 	// initializes Xlib support for concurrent threads.
-	if (XInitThreads() == 0)
-	{
-		throw XArch("XInitThreads() returned zero");
-	}
+	// ...which breaks badly on RHEL for some reason, upstream #194
+	//if (XInitThreads() == 0)
+	//{
+	//	throw XArch("XInitThreads() returned zero");
+	//}
 	
 
 	// set the X I/O error handler so we catch the display disconnecting


Index: synergy-plus.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy-plus/EL-5/synergy-plus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- synergy-plus.spec	14 Sep 2009 12:43:23 -0000	1.1
+++ synergy-plus.spec	24 Nov 2009 19:30:09 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy-plus
 Version: 1.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://code.google.com/p/synergy-plus/
 Source: http://synergy-plus.googlecode.com/files/synergy-plus-%{version}.tar.gz
+Patch0: synergy-plus-1.3.4-xinitthreads.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -25,6 +26,9 @@ Synergy, which hasn't received any sourc
 
 %prep
 %setup -q
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 # Remove spurious executable bit from sources files
 find . -type f -name '*.cpp' -exec chmod -x {} \;
 
@@ -53,6 +57,9 @@ find . -type f -name '*.cpp' -exec chmod
 
 
 %changelog
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-4
+- Disable XInitThreads() on RHEL to fix hang (upstream #194).
+
 * Tue Aug 18 2009 Matthias Saou <http://freshrpms.net/> 1.3.4-3
 - Don't use the -executable find option, it doesn't work with older versions.