head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2010Q4:1.2.0.12
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.10
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.8
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.6
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.4
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.2
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.1.0.20
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.18
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.16
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.14
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.12
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.10
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.8
	pkgsrc-2008Q1:1.1.0.6
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.4
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.2
	pkgsrc-2007Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.01.23.02.24.29;	author tnn;	state dead;
branches;
next	1.2;

1.2
date	2009.09.19.19.14.54;	author tnn;	state Exp;
branches;
next	1.1;

1.1
date	2007.09.07.05.42.25;	author taca;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to synergy-1.3.6.

The synergy project has now merged with the previously forked synergy-plus.
This contains lots of bugfixes since the previous update in pkgsrc, in 2006.
No complete ChangeLog is available, but now uses devel/cmake to build and
sports manpages for the commands.
@
text
@$NetBSD: patch-ac,v 1.2 2009/09/19 19:14:54 tnn Exp $

Fix compile problem with gcc4.
CXWindowsScreen.cpp: In member function 'void CXWindowsScreen::openIM()':
CXWindowsScreen.cpp:990: warning: missing sentinel in function call
CXWindowsScreen.cpp:1013: warning: missing sentinel in function call
CXWindowsScreen.cpp:1022: warning: missing sentinel in function call

--- lib/platform/CXWindowsScreen.cpp.orig	2006-04-02 21:16:39.000000000 +0200
+++ lib/platform/CXWindowsScreen.cpp
@@@@ -26,6 +26,7 @@@@
 #include "CStringUtil.h"
 #include "IEventQueue.h"
 #include "TMethodEventJob.h"
+#include <stdlib.h>
 #include <cstring>
 #if X_DISPLAY_MISSING
 #	error X11 is required to build synergy
@@@@ -987,7 +988,7 @@@@ CXWindowsScreen::openIM()
 	// find the appropriate style.  synergy supports XIMPreeditNothing
 	// only at the moment.
 	XIMStyles* styles;
-	if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL ||
+	if (XGetIMValues(im, XNQueryInputStyle, &styles, (char *)NULL) != NULL ||
 		styles == NULL) {
 		LOG((CLOG_WARN "cannot get IM styles"));
 		XCloseIM(im);
@@@@ -1010,7 +1011,7 @@@@ CXWindowsScreen::openIM()
 	}
 
 	// create an input context for the style and tell it about our window
-	XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, NULL);
+	XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, (char *)NULL);
 	if (ic == NULL) {
 		LOG((CLOG_WARN "cannot create IC"));
 		XCloseIM(im);
@@@@ -1019,7 +1020,7 @@@@ CXWindowsScreen::openIM()
 
 	// find out the events we must select for and do so
 	unsigned long mask;
-	if (XGetICValues(ic, XNFilterEvents, &mask, NULL) != NULL) {
+	if (XGetICValues(ic, XNFilterEvents, &mask, (char *)NULL) != NULL) {
 		LOG((CLOG_WARN "cannot get IC filter events"));
 		XDestroyIC(ic);
 		XCloseIM(im);
@


1.2
log
@include various system headers to get called function prototypes in scope.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Fix build problem with gcc4 (on NetBSD 4/current).
@
text
@d9 1
a9 1
--- lib/platform/CXWindowsScreen.cpp.orig	2006-04-02 19:16:39.000000000 +0000
d11 9
a19 1
@@@@ -987,7 +987,7 @@@@ CXWindowsScreen::openIM()
d28 1
a28 1
@@@@ -1010,7 +1010,7 @@@@ CXWindowsScreen::openIM()
d37 1
a37 1
@@@@ -1019,7 +1019,7 @@@@ CXWindowsScreen::openIM()
@