Revision: 2401
http://gar.svn.sourceforge.net/gar/?rev=2401&view=rev
Author: skayser
Date: 2008-11-30 01:10:50 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
synergy: Enabled compilation with Sun CC
Modified Paths:
--------------
csw/mgar/pkg/synergy/trunk/Makefile
csw/mgar/pkg/synergy/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/synergy/trunk/files/link-xlibs.diff
csw/mgar/pkg/synergy/trunk/files/suncc.diff
Removed Paths:
-------------
csw/mgar/pkg/synergy/trunk/files/CSWsynergy.depend
Modified: csw/mgar/pkg/synergy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/synergy/trunk/Makefile 2008-11-30 00:04:04 UTC (rev 2400)
+++ csw/mgar/pkg/synergy/trunk/Makefile 2008-11-30 01:10:50 UTC (rev 2401)
@@ -2,22 +2,52 @@
GARVERSION = 1.3.1
CATEGORIES = apps
-DESCRIPTION = Synergy lets you easily share a single mouse and keyboard
between multiple computer
+DESCRIPTION = Software-based TCP/IP "KVM" switch
define BLURB
+ Synergy lets you easily share a single mouse and keyboard between multiple
+ computers with different operating systems, each with its own display,
+ without special hardware. It's intended for users with multiple computers
+ on their desk since each system uses its own monitor(s).
endef
-GARCOMPILER = GNU
-GNU_CC_HOME = /opt/csw/gcc3
-
+MASTER_SITES = $(SF_MIRRORS)
SF_PROJ = $(GARNAME)2
-MASTER_SITES = $(SF_MIRRORS)
DISTFILES = synergy-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWsynergy,depend)
+DISTFILES += $(call admfiles,CSWsynergy)
-PATCHFILES = missing-fonts.diff
+# Adjust code so that it compiles with Sun Studio Compiler
+#
https://sourceforge.net/tracker/index.php?func=detail&aid=1574331&group_id=59275&atid=490469
+PATCHFILES = suncc.diff
-CONFIGURE_ARGS = --prefix=$(prefix) --x-libraries=/usr/openwin/lib
--x-includes=/usr/X/include
+# Adjust configure.in to properly use --x-libraries option
+#
http://sf.net/tracker/index.php?func=detail&aid=2359359&group_id=59275&atid=490469
+PATCHFILES += link-xlibs.diff
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --x-includes=/usr/openwin/include
+CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib
+
TEST_SCRIPTS =
+# fix missing user write permissions
+post-extract:
+ @chmod -R u+w $(WORKSRC)
+ @$(MAKECOOKIE)
+
+pre-configure:
+ cd $(WORKSRC) && autoreconf
+ @$(MAKECOOKIE)
+
+post-install:
+ @ginstall -d $(DESTDIR)$(sysconfdir)
+ @ginstall -m 644 $(WORKSRC)/examples/synergy.conf \
+ $(DESTDIR)$(sysconfdir)/synergy.conf.example
+ @ginstall -d $(DESTDIR)$(docdir)/images
+ @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)
+ @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)
+ @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)
+ @ginstall -m 644 $(WORKSRC)/doc/*.html $(DESTDIR)$(docdir)
+ @ginstall -m 644 $(WORKSRC)/doc/images/* $(DESTDIR)$(docdir)/images
+ @$(MAKECOOKIE)
+
include gar/category.mk
Modified: csw/mgar/pkg/synergy/trunk/checksums
===================================================================
--- csw/mgar/pkg/synergy/trunk/checksums 2008-11-30 00:04:04 UTC (rev
2400)
+++ csw/mgar/pkg/synergy/trunk/checksums 2008-11-30 01:10:50 UTC (rev
2401)
@@ -1,4 +1,4 @@
a6e09d6b71cb217f23069980060abf27 download/synergy-1.3.1.tar.gz
8ee797c256fbfdd223d1647dcab454a0 download/CSWsynergy.gspec
-c7dc9486ea1f502789d40e3e9a83ee4b download/CSWsynergy.depend
-8835a60bf03e6dff91eb73ba73bcba1b download/missing-fonts.diff
+aa4510eb9fbc50674aa20395f772b1c0 download/suncc.diff
+4d57febac6efdffb43d9edc9a3a9c2d4 download/link-xlibs.diff
Deleted: csw/mgar/pkg/synergy/trunk/files/CSWsynergy.depend
===================================================================
--- csw/mgar/pkg/synergy/trunk/files/CSWsynergy.depend 2008-11-30 00:04:04 UTC
(rev 2400)
+++ csw/mgar/pkg/synergy/trunk/files/CSWsynergy.depend 2008-11-30 01:10:50 UTC
(rev 2401)
@@ -1 +0,0 @@
-P CSWgcc3corert
Added: csw/mgar/pkg/synergy/trunk/files/link-xlibs.diff
===================================================================
--- csw/mgar/pkg/synergy/trunk/files/link-xlibs.diff
(rev 0)
+++ csw/mgar/pkg/synergy/trunk/files/link-xlibs.diff 2008-11-30 01:10:50 UTC
(rev 2401)
@@ -0,0 +1,29 @@
+diff --speed-large-files --minimal -Nru synergy-1.3.1.orig/configure.in
synergy-1.3.1/configure.in
+--- synergy-1.3.1.orig/configure.in 2006-04-02 06:27:07.000000000 +0200
++++ synergy-1.3.1/configure.in 2008-11-28 23:37:41.074629177 +0100
+@@ -106,14 +106,16 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ save_CPPFLAGS="$CPPFLAGS"
++ save_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$X_CFLAGS $CPPFLAGS"
++ LDFLAGS="$X_LIBS $LDFLAGS"
+ XEXT_LDADD=
+
+ AC_CHECK_LIB(Xtst,
+ XTestQueryExtension,
+ [XEXT_LDADD="$XEXT_LDADD -lXtst"],
+ AC_MSG_ERROR(You must have the XTest library to build synergy),
+- [$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
++ [-lXext -lX11 $X_EXTRA_LIBS])
+ AC_CHECK_HEADERS([X11/extensions/XTest.h],
+ ,
+ AC_MSG_ERROR(You must have the XTest headers to compile
synergy))
+@@ -202,6 +204,7 @@
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
+ ARCH_LIBS="$X_LIBS $X_PRE_LIBS $XEXT_LDADD -lXext -lX11 $X_EXTRA_LIBS
$ARCH_LIBS"
+ ARCH_CFLAGS="$ARCH_CFLAGS $X_CFLAGS"
+ fi
Added: csw/mgar/pkg/synergy/trunk/files/suncc.diff
===================================================================
--- csw/mgar/pkg/synergy/trunk/files/suncc.diff (rev 0)
+++ csw/mgar/pkg/synergy/trunk/files/suncc.diff 2008-11-30 01:10:50 UTC (rev
2401)
@@ -0,0 +1,178 @@
+diff -u -r synergy-1.3.1-original/lib/arch/CArchConsoleUnix.cpp
synergy-1.3.1/lib/arch/CArchConsoleUnix.cpp
+--- synergy-1.3.1-original/lib/arch/CArchConsoleUnix.cpp Mon Mar 13
05:24:50 2006
++++ synergy-1.3.1/lib/arch/CArchConsoleUnix.cpp Mon Oct 9 17:57:37 2006
+@@ -13,7 +13,7 @@
+ */
+
+ #include "CArchConsoleUnix.h"
+-#include <cstdio>
++#include <stdio.h>
+
+ //
+ // CArchConsoleUnix
+diff -u -r synergy-1.3.1-original/lib/platform/CXWindowsClipboard.cpp
synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp
+--- synergy-1.3.1-original/lib/platform/CXWindowsClipboard.cpp Sun Apr 2
03:47:03 2006
++++ synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp Mon Oct 9 18:29:38 2006
+@@ -750,7 +750,7 @@
+ }
+
+ // save it
+- motifFormats.insert(std::make_pair(motifFormat->m_type, data));
++ motifFormats.insert(std::pair<unsigned long,
std::string>(motifFormat->m_type, data));
+ }
+ //const UInt32 numMotifFormats = motifFormats.size();
+
+diff -u -r synergy-1.3.1-original/lib/platform/CXWindowsKeyState.cpp
synergy-1.3.1/lib/platform/CXWindowsKeyState.cpp
+--- synergy-1.3.1-original/lib/platform/CXWindowsKeyState.cpp Sun Apr 2
21:16:39 2006
++++ synergy-1.3.1/lib/platform/CXWindowsKeyState.cpp Mon Oct 9 18:36:15 2006
+@@ -468,7 +468,7 @@
+
+ // add key
+ keyMap.addKeyEntry(item);
+- m_keyCodeFromKey.insert(std::make_pair(item.m_id,
keycode));
++ m_keyCodeFromKey.insert(std::pair<const KeyID,
KeyCode>(item.m_id, keycode));
+
+ // add other ways to synthesize the key
+ if ((j & 1) != 0) {
+@@ -714,9 +714,9 @@
+
+ if (group == 0) {
+ m_keyCodeFromKey.insert(
+-
std::make_pair(lKeyID, keycode));
++
std::pair<const KeyID, KeyCode>(lKeyID, keycode));
+ m_keyCodeFromKey.insert(
+-
std::make_pair(uKeyID, keycode));
++
std::pair<const KeyID, KeyCode>(uKeyID, keycode));
+ }
+ continue;
+ }
+@@ -726,7 +726,7 @@
+ item.m_id =
CXWindowsUtil::mapKeySymToKeyID(keysym);
+ keyMap.addKeyEntry(item);
+ if (group == 0) {
+-
m_keyCodeFromKey.insert(std::make_pair(item.m_id, keycode));
++ m_keyCodeFromKey.insert(std::pair<const
KeyID, KeyCode>(item.m_id, keycode));
+ }
+ }
+ }
+diff -u -r synergy-1.3.1-original/lib/platform/CXWindowsScreen.cpp
synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
+--- synergy-1.3.1-original/lib/platform/CXWindowsScreen.cpp Sun Apr 2
21:16:39 2006
++++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp Mon Oct 9 18:37:47 2006
+@@ -600,7 +600,7 @@
+ XGrabKey(m_display, code,
modifiers2, m_root,
+ False,
GrabModeAsync, GrabModeAsync);
+ if (!err) {
+-
hotKeys.push_back(std::make_pair(code, modifiers2));
++
hotKeys.push_back(std::make_pair(static_cast<int>(code), modifiers2));
+
m_hotKeyToIDMap[CHotKeyItem(code, modifiers2)] = id;
+ }
+ }
+diff -u -r synergy-1.3.1-original/lib/server/CConfig.cpp
synergy-1.3.1/lib/server/CConfig.cpp
+--- synergy-1.3.1-original/lib/server/CConfig.cpp Wed Mar 22 06:40:27 2006
++++ synergy-1.3.1/lib/server/CConfig.cpp Mon Oct 9 19:28:35 2006
+@@ -1739,7 +1739,7 @@
+ index !=
config.m_nameToCanonicalName.end();
+ ++index) {
+ if (index->first != index->second) {
+- aliases.insert(std::make_pair(index->second,
index->first));
++ aliases.insert(std::pair<const
std::string,std::string>(index->second, index->first));
+ }
+ }
+
+diff -u -r synergy-1.3.1-original/lib/server/CConfig.h
synergy-1.3.1/lib/server/CConfig.h
+--- synergy-1.3.1-original/lib/server/CConfig.h Mon Feb 20 22:00:04 2006
++++ synergy-1.3.1/lib/server/CConfig.h Mon Oct 9 19:26:46 2006
+@@ -26,6 +26,8 @@
+ #include "IPlatformScreen.h"
+ #include <iosfwd>
+
++#include <iterator>
++
+ class CConfig;
+ class CConfigReadContext;
+
+@@ -38,8 +40,11 @@
+ typedef CString* pointer;
+ typedef CString& reference;
+ };
++typedef iterator_traits<CConfig> CConfig_iterator_traits;
+ };
+
++
++
+ //! Server configuration
+ /*!
+ This class holds server configuration information. That includes
+@@ -142,7 +147,8 @@
+ typedef CCell::const_iterator link_const_iterator;
+ typedef CCellMap::const_iterator internal_const_iterator;
+ typedef CNameMap::const_iterator all_const_iterator;
+- class const_iterator : std::iterator_traits<CConfig> {
++
++ class const_iterator : std::CConfig_iterator_traits {
+ public:
+ explicit const_iterator() : m_i() { }
+ explicit const_iterator(const internal_const_iterator& i) :
m_i(i) { }
+@@ -168,6 +174,7 @@
+ internal_const_iterator m_i;
+ };
+
++
+ CConfig();
+ virtual ~CConfig();
+
+@@ -533,4 +540,7 @@
+ CString m_error;
+ };
+
++
++
++
+ #endif
+diff -u -r synergy-1.3.1-original/lib/synergy/CKeyMap.cpp
synergy-1.3.1/lib/synergy/CKeyMap.cpp
+--- synergy-1.3.1-original/lib/synergy/CKeyMap.cpp Wed Mar 22 06:40:27 2006
++++ synergy-1.3.1/lib/synergy/CKeyMap.cpp Mon Oct 9 18:26:11 2006
+@@ -966,7 +966,7 @@
+ if (keyItem.m_generates != 0) {
+ if (!keyItem.m_lock || (currentState &
keyItem.m_generates) == 0) {
+ // add modifier key and activate modifier
+- activeModifiers.insert(std::make_pair(
++ activeModifiers.insert( std::pair<const
KeyModifierMask,KeyItem>(
+
keyItem.m_generates, keyItem));
+ currentState |= keyItem.m_generates;
+ }
+@@ -1039,10 +1039,10 @@
+ else {
+ // release all the keys that generate the modifier that
are
+ // currently down
+- std::pair<ModifierToKeys::const_iterator,
+- ModifierToKeys::const_iterator>
range =
++ std::pair<ModifierToKeys::iterator,
++ ModifierToKeys::iterator> range
=
+
activeModifiers.equal_range(keyItem.m_generates);
+- for (ModifierToKeys::const_iterator i = range.first;
++ for (ModifierToKeys::iterator i = range.first;
+ i !=
range.second; ++i) {
+
keystrokes.push_back(Keystroke(i->second.m_button,
+ false, false,
i->second.m_client));
+@@ -1050,7 +1050,7 @@
+ }
+
+ if (type == kKeystrokeModify) {
+- activeModifiers.insert(std::make_pair(
++ activeModifiers.insert(std::pair<const
KeyModifierMask,KeyItem>(
+
keyItem.m_generates, keyItem));
+ currentState |= keyItem.m_generates;
+ }
+diff -u -r synergy-1.3.1-original/lib/synergy/CKeyState.cpp
synergy-1.3.1/lib/synergy/CKeyState.cpp
+--- synergy-1.3.1-original/lib/synergy/CKeyState.cpp Sat Apr 1 22:53:08 2006
++++ synergy-1.3.1/lib/synergy/CKeyState.cpp Mon Oct 9 18:27:35 2006
+@@ -500,7 +500,7 @@
+ reinterpret_cast<CAddActiveModifierContext*>(vcontext);
+ if (group == context->m_activeGroup &&
+ (keyItem.m_generates & context->m_mask) != 0) {
+- context->m_activeModifiers.insert(std::make_pair(
++ context->m_activeModifiers.insert(std::pair<const
KeyModifierMask,CKeyMap::KeyItem>(
+
keyItem.m_generates, keyItem));
+ }
+ }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
