rpms/synergy/devel synergy-1.3.1-warnings.patch, NONE, 1.1 synergy-1.3.1-X11-DPMS.patch, 1.1, 1.2 synergy.spec, 1.23, 1.24

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/synergy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328

Modified Files:
	synergy-1.3.1-X11-DPMS.patch synergy.spec 
Added Files:
	synergy-1.3.1-warnings.patch 
Log Message:
* Mon Jun  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.1-9
- Drop no longer needed patch0, stop regenerating autoxxx files
- Apply the following bug fixes from upstream's bug tracker:
  -off by one bugfix to X11 selection (fixes copy and paste by selection)
  -call DPMSOn() when entering screen to make sure powersaving mode is canceled
   on X11 client systems when the fake mouse / keyb become active
- Add manpages (courtesy of Debian)


synergy-1.3.1-warnings.patch:

--- NEW FILE synergy-1.3.1-warnings.patch ---
diff -up synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp~ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
--- synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp~	2008-06-02 20:22:31.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp	2008-06-02 20:22:31.000000000 +0200
@@ -38,6 +38,8 @@ CArchDaemonUnix::~CArchDaemonUnix()
 int
 CArchDaemonUnix::daemonize(const char* name, DaemonFunc func)
 {
+	int dummy;
+	
 	// fork so shell thinks we're done and so we're not a process
 	// group leader
 	switch (fork()) {
@@ -58,7 +60,7 @@ CArchDaemonUnix::daemonize(const char* n
 	setsid();
 
 	// chdir to root so we don't keep mounted filesystems points busy
-	chdir("/");
+	dummy = chdir("/");
 
 	// mask off permissions for any but owner
 	umask(077);
@@ -72,7 +74,7 @@ CArchDaemonUnix::daemonize(const char* n
 	// of standard I/O safely goes in the bit bucket.
 	open("/dev/null", O_RDONLY);
 	open("/dev/null", O_RDWR);
-	dup(1);
+	dummy = dup(1);
 
 	// invoke function
 	return func(1, &name);
diff -up synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp~ synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp
--- synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp~	2008-06-02 20:25:02.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchNetworkBSD.cpp	2008-06-02 20:27:12.000000000 +0200
@@ -314,8 +314,10 @@ 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;
+
 		do {
-			read(unblockPipe[0], dummy, sizeof(dummy));
+			ignore = read(unblockPipe[0], dummy, sizeof(dummy));
 		} while (errno != EAGAIN);
 
 		// don't count this unblock pipe in return value
@@ -487,7 +489,9 @@ CArchNetworkBSD::unblockPollSocket(CArch
 	const int* unblockPipe = getUnblockPipeForThread(thread);
 	if (unblockPipe != NULL) {
 		char dummy = 0;
-		write(unblockPipe[1], &dummy, 1);
+		int ignore;
+
+		ignore = write(unblockPipe[1], &dummy, 1);
 	}
 }
 

synergy-1.3.1-X11-DPMS.patch:

Index: synergy-1.3.1-X11-DPMS.patch
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/synergy-1.3.1-X11-DPMS.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synergy-1.3.1-X11-DPMS.patch	2 Jun 2008 15:08:16 -0000	1.1
+++ synergy-1.3.1-X11-DPMS.patch	2 Jun 2008 18:40:56 -0000	1.2
@@ -1,7 +1,7 @@
---- lib/platform/CXWindowsScreen.cpp.save	Sun Apr 20 14:32:02 2008
-+++ lib/platform/CXWindowsScreen.cpp	Sun Apr 20 14:34:33 2008
-@@ -34,8 +34,11 @@
- #	include <X11/Xutil.h>
+diff -up synergy-1.3.1/lib/platform/CXWindowsScreen.cpp.dpms synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
+--- synergy-1.3.1/lib/platform/CXWindowsScreen.cpp.dpms	2008-06-02 19:32:47.000000000 +0200
++++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp	2008-06-02 19:39:32.000000000 +0200
+@@ -36,6 +36,9 @@
  #	define XK_MISCELLANY
  #	define XK_XKB_KEYS
  #	include <X11/keysymdef.h>
@@ -11,21 +11,23 @@
  #	if HAVE_X11_EXTENSIONS_XTEST_H
  #		include <X11/extensions/XTest.h>
  #	else
- #		error The XTest extension is required to build synergy
-@@ -228,8 +231,16 @@
- 		CXWindowsUtil::CErrorLock lock(m_display);
+@@ -230,6 +233,19 @@ CXWindowsScreen::enter()
  		XSetInputFocus(m_display, m_lastFocus, m_lastFocusRevert, CurrentTime);
  	}
  
 +	// Force the DPMS to turn screen back on since we don't
 +	// actually cause physical hardware input to trigger it
 +	int dummy;
-+	if (DPMSQueryExtension(m_display, &dummy, &dummy))
++	CARD16 powerlevel;
++	BOOL enabled;
++	if (DPMSQueryExtension(m_display, &dummy, &dummy) &&
++	    DPMSCapable(m_display) &&
++	    DPMSInfo(m_display, &powerlevel, &enabled))
 +	{
-+		DPMSForceLevel(m_display, DPMSModeOn);
++		if (enabled && powerlevel != DPMSModeOn)
++			DPMSForceLevel(m_display, DPMSModeOn);
 +	}
 +
  	// unmap the hider/grab window.  this also ungrabs the mouse and
  	// keyboard if they're grabbed.
  	XUnmapWindow(m_display, m_window);
- 


Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- synergy.spec	2 Jun 2008 15:08:16 -0000	1.23
+++ synergy.spec	2 Jun 2008 18:40:56 -0000	1.24
@@ -1,23 +1,21 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
 Version: 1.3.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
 Source: http://downloads.sf.net/synergy2/synergy-%{version}.tar.gz
 Source1: synergyc.1
 Source2: synergys.1
-Patch0: synergy-1.2.2-werror.patch
 Patch1: synergy-1.3.1-gcc43.patch
 Patch2: synergy-1.3.1-copynpaste-crash.patch
 Patch3: synergy-1.3.1-X11-selection.patch
 Patch4: synergy-1.3.1-X11-DPMS.patch
+Patch5: synergy-1.3.1-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
 BuildRequires: libXinerama-devel
-# Required by autoreconf
-BuildRequires: autoconf, automake
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -29,12 +27,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .werror
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .copynpaste
 %patch3 -p1
-%patch4 -p0
-autoreconf
+%patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -66,6 +63,7 @@
 
 %changelog
 * Mon Jun  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.1-9
+- Drop no longer needed patch0, stop regenerating autoxxx files
 - Apply the following bug fixes from upstream's bug tracker:
   -off by one bugfix to X11 selection (fixes copy and paste by selection)
   -call DPMSOn() when entering screen to make sure powersaving mode is canceled