summaryrefslogtreecommitdiff
path: root/net/synergy
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2007-09-07 05:42:25 +0000
committertaca <taca@pkgsrc.org>2007-09-07 05:42:25 +0000
commitdfa21108ce9a3b2045e57baf20a5f33b0c773086 (patch)
treea079eb170de24f55ffc4cc795fd3bcf8a4d90540 /net/synergy
parente8b5914e080d9d7dbd5c303ad32067bdae8b61d6 (diff)
downloadpkgsrc-dfa21108ce9a3b2045e57baf20a5f33b0c773086.tar.gz
Fix build problem with gcc4 (on NetBSD 4/current).
Diffstat (limited to 'net/synergy')
-rw-r--r--net/synergy/distinfo3
-rw-r--r--net/synergy/patches/patch-ac37
2 files changed, 39 insertions, 1 deletions
diff --git a/net/synergy/distinfo b/net/synergy/distinfo
index 6b57b003be4..6da6438afdd 100644
--- a/net/synergy/distinfo
+++ b/net/synergy/distinfo
@@ -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 --git a/net/synergy/patches/patch-ac b/net/synergy/patches/patch-ac
new file mode 100644
index 00000000000..284fb44bb92
--- /dev/null
+++ b/net/synergy/patches/patch-ac
@@ -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);