[synergy-plus] make it build with latest gcc (unused vars)

[Karsten Hopp]

commit b6c6f5f3b42bbd2dd215103f3f640a81030a1f91
Author: Karsten Hopp <karsten at redhat.com>
Date:   Wed Jun 8 12:23:52 2011 +0200

    make it build with latest gcc (unused vars)

 synergy-plus-1.3.4-unusedvar.patch |   45 ++++++++++++++++++++++++++++++++++++
 synergy-plus.spec                  |    5 ++++
 2 files changed, 50 insertions(+), 0 deletions(-)
---
diff --git a/synergy-plus-1.3.4-unusedvar.patch b/synergy-plus-1.3.4-unusedvar.patch
new file mode 100644
index 0000000..f9ee81e
--- /dev/null
+++ b/synergy-plus-1.3.4-unusedvar.patch
@@ -0,0 +1,45 @@
+diff -up synergy-plus-1.3.4/lib/arch/CArchDaemonUnix.cpp.unusedvar synergy-plus-1.3.4/lib/arch/CArchDaemonUnix.cpp
+--- synergy-plus-1.3.4/lib/arch/CArchDaemonUnix.cpp.unusedvar	2009-07-21 22:28:40.000000000 +0200
++++ synergy-plus-1.3.4/lib/arch/CArchDaemonUnix.cpp	2011-06-08 12:12:40.099436353 +0200
+@@ -38,7 +38,7 @@ CArchDaemonUnix::~CArchDaemonUnix()
+ int
+ CArchDaemonUnix::daemonize(const char* name, DaemonFunc func)
+ {
+-	int dummy;
++	__attribute__((__unused__))int dummy;
+ 	
+ 	// fork so shell thinks we're done and so we're not a process
+ 	// group leader
+diff -up synergy-plus-1.3.4/lib/arch/CArchNetworkBSD.cpp.unusedvar synergy-plus-1.3.4/lib/arch/CArchNetworkBSD.cpp
+--- synergy-plus-1.3.4/lib/arch/CArchNetworkBSD.cpp.unusedvar	2009-07-21 22:28:40.000000000 +0200
++++ synergy-plus-1.3.4/lib/arch/CArchNetworkBSD.cpp	2011-06-08 12:12:40.099436353 +0200
+@@ -316,7 +316,7 @@ CArchNetworkBSD::pollSocket(CPollEntry p
+ 	if (n > 0 && unblockPipe != NULL && (pfd[num].revents & POLLIN) != 0) {
+ 		// the unblock event was signalled.  flush the pipe.
+ 		char dummy[100];
+-		int ignore;
++		__attribute__((__unused__)) int ignore;
+ 
+ 		do {
+ 			ignore = read(unblockPipe[0], dummy, sizeof(dummy));
+@@ -491,7 +491,7 @@ CArchNetworkBSD::unblockPollSocket(CArch
+ 	const int* unblockPipe = getUnblockPipeForThread(thread);
+ 	if (unblockPipe != NULL) {
+ 		char dummy = 0;
+-		int ignore;
++		__attribute__((__unused__)) int ignore;
+ 
+ 		ignore = write(unblockPipe[1], &dummy, 1);
+ 	}
+diff -up synergy-plus-1.3.4/lib/platform/CXWindowsEventQueueBuffer.cpp.unusedvar synergy-plus-1.3.4/lib/platform/CXWindowsEventQueueBuffer.cpp
+--- synergy-plus-1.3.4/lib/platform/CXWindowsEventQueueBuffer.cpp.unusedvar	2011-06-08 12:13:37.103436361 +0200
++++ synergy-plus-1.3.4/lib/platform/CXWindowsEventQueueBuffer.cpp	2011-06-08 12:14:03.763436366 +0200
+@@ -114,7 +114,7 @@ CXWindowsEventQueueBuffer::waitForEvent(
+ 	pfds[1].events = POLLIN;
+ 	int timeout    = (dtimeout < 0.0) ? -1 :
+ 						static_cast<int>(1000.0 * dtimeout);
+-		int retval     =  0;
++		__attribute__((__unused__)) int retval     =  0;
+ #else
+ 	struct timeval timeout;
+ 	struct timeval* timeoutPtr;
diff --git a/synergy-plus.spec b/synergy-plus.spec
index de8d587..c584598 100644
--- a/synergy-plus.spec
+++ b/synergy-plus.spec
@@ -7,6 +7,7 @@ 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
+Patch1: synergy-plus-1.3.4-unusedvar.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Useful for frontends such as quicksynergy (#524910)
 Provides: synergy = %{version}-%{release}
@@ -33,6 +34,7 @@ Synergy, which hasn't received any source updates or new releases since 2006.
 %if 0%{?rhel} >= 4 && 0%{?rhel} < 6
 %patch0 -p1
 %endif
+%patch1 -p1 -b .unusedvar
 # Remove spurious executable bit from sources files
 find . -type f -name '*.cpp' -exec chmod -x {} \;
 
@@ -61,6 +63,9 @@ find . -type f -name '*.cpp' -exec chmod -x {} \;
 
 
 %changelog
+* Wed Jun 08 2011 Karsten Hopp <karsten at redhat.com> 1.3.4-7
+- make it build with latest gcc (unused vars)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild