[pkgsrc/trunk]: pkgsrc/net/synergy Fix build problem with gcc4 (on NetBSD 4/c...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ba5650180a5
branches:  trunk
changeset: 533010:2ba5650180a5
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Sep 07 05:42:25 2007 +0000

description:
Fix build problem with gcc4 (on NetBSD 4/current).

diffstat:

 net/synergy/distinfo         |   3 ++-
 net/synergy/patches/patch-ac |  37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r d12c0545f4b6 -r 2ba5650180a5 net/synergy/distinfo
--- a/net/synergy/distinfo      Thu Sep 06 22:01:44 2007 +0000
+++ b/net/synergy/distinfo      Fri Sep 07 05:42:25 2007 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/08/17 14:02:23 taca Exp $
+$NetBSD: distinfo,v 1.5 2007/09/07 05:42:25 taca Exp $
 
 SHA1 (synergy-1.3.1.tar.gz) = 03113ec8aadfecaeba8e369b083f4fb5b44f5c62
 RMD160 (synergy-1.3.1.tar.gz) = 5f5d7cb8fcfb57a6c8eae83fb53c704cb85c6c16
 Size (synergy-1.3.1.tar.gz) = 793172 bytes
 SHA1 (patch-aa) = da4ad36cdcec251bf4334c2dccd68346042894de
 SHA1 (patch-ab) = fae459f7063a6a879b385a94d5e889877c94860d
+SHA1 (patch-ac) = 4a5ac29f4d4c51ea03d985a2d481259a1a733dc7
diff -r d12c0545f4b6 -r 2ba5650180a5 net/synergy/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/synergy/patches/patch-ac      Fri Sep 07 05:42:25 2007 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-ac,v 1.1 2007/09/07 05:42:25 taca 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 19:16:39.000000000 +0000
++++ lib/platform/CXWindowsScreen.cpp
+@@ -987,7 +987,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 +1010,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 +1019,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);