[csw-devel] SF.net SVN: gar:[19567] csw/mgar/pkg/synergy/trunk
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Wed Nov 7 11:20:27 CET 2012
Revision: 19567
http://gar.svn.sourceforge.net/gar/?rev=19567&view=rev
Author: janholzh
Date: 2012-11-07 10:20:27 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
synergy/trunk: update to 1.4.10 and make it work
Modified Paths:
--------------
csw/mgar/pkg/synergy/trunk/Makefile
csw/mgar/pkg/synergy/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/synergy/trunk/files/0001-change-endiness-detection.patch
Modified: csw/mgar/pkg/synergy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/synergy/trunk/Makefile 2012-11-07 09:17:10 UTC (rev 19566)
+++ csw/mgar/pkg/synergy/trunk/Makefile 2012-11-07 10:20:27 UTC (rev 19567)
@@ -1,17 +1,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
-# ! Doesn't yet build
-# "../../lib/server/CConfig.h", line 145: Error: "," expected instead of "<".
-# "../../lib/server/CConfig.h", line 145: Error: Use ";" to terminate declarations.
-# "../../lib/server/CConfig.h", line 145: Error: "}" expected instead of "<".
-# "../../lib/server/CConfig.h", line 145: Error: Use ";" to terminate declarations.
-# "../../lib/server/CConfig.h", line 145: Error: A declaration was expected instead of "<".
-# "../../lib/server/CConfig.h", line 145: Warning: declarator required in declaration.
-# "../../lib/server/CConfig.h", line 145: Error: Use ";" to terminate declarations.
-# "../../lib/server/CConfig.h", line 145: Error: A declaration was expected instead of ">"
-#
NAME = synergy
-VERSION = 1.4.2
+VERSION = 1.4.10
CATEGORIES = apps
GARTYPE = v2
@@ -29,46 +19,67 @@
VENDOR_URL = http://synergy-foss.org/
-# Was required with synergy 1.3.1, still required?
-# 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
+GARCOMPILER = GNU
-# Was required with synergy 1.3.1, still required?
-# 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
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-# TEST_SCRIPTS =
+PATCHFILES += 0001-change-endiness-detection.patch
-#pre-configure:
-# cd $(WORKSRC) && autoreconf
-# @$(MAKECOOKIE)
+RUNTIME_DEP_PKGS_CSWsynergy += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWsynergy += CSWlibstdc++6
+
+
+#cmake fun:
+# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide
+
+CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
+CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)"
+CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
+
+
CONFIGURE_SCRIPTS = custom
-BUILD_SCRIPTS = custom
+INSTALL_SCRIPTS = custom
+SKIPTEST ?= 1
+
include gar/category.mk
+
configure-custom:
- cd $(WORKSRC) && ./hm.sh configure
+ # --debug-output \
+ # --debug-trycompile \
+ (cd $(WORKSRC) && \
+ /usr/bin/env -i \
+ $(CONFIGURE_ENV) \
+ cmake \
+ . \
+ $(CMAKE_ARGS))
+ @$(MAKECOOKIE)
-build-custom:
- cd $(WORKSRC) && ./hm.sh build
-post-install:
+install-custom:
+ ginstall -d $(DESTDIR)$(bindir)
ginstall -d $(DESTDIR)$(sysconfdir)
- ginstall -d $(DESTDIR)$(docdir)/$(NAME)/images
+ ginstall -d $(DESTDIR)$(mandir)
+ ginstall -d $(DESTDIR)$(mandir)/man3
ginstall -m 644 \
- $(WORKSRC)/examples/synergy.conf \
+ $(WORKSRC)/doc/synergy.conf.example \
$(DESTDIR)$(sysconfdir)/synergy.conf.example
+ ginstall \
+ $(WORKSRC)/bin/synergyc \
+ $(DESTDIR)$(bindir)
+ ginstall \
+ $(WORKSRC)/bin/synergys \
+ $(DESTDIR)$(bindir)
ginstall -m 644 \
- $(WORKSRC)/README \
- $(WORKSRC)/AUTHORS \
- $(WORKSRC)/NEWS \
- $(WORKSRC)/doc/*.html \
- $(DESTDIR)$(docdir)/$(NAME)
+ $(WORKSRC)/doc/synergyc.man \
+ $(DESTDIR)$(mandir)/man3/synergyc.3
ginstall -m 644 \
- $(WORKSRC)/doc/images/* \
- $(DESTDIR)$(docdir)/$(NAME)/images
+ $(WORKSRC)/doc/synergys.man \
+ $(DESTDIR)$(mandir)/man3/synergys.3
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/synergy/trunk/checksums
===================================================================
--- csw/mgar/pkg/synergy/trunk/checksums 2012-11-07 09:17:10 UTC (rev 19566)
+++ csw/mgar/pkg/synergy/trunk/checksums 2012-11-07 10:20:27 UTC (rev 19567)
@@ -1 +1 @@
-cd4e18a206d4c326de7b728256350d87 synergy-1.4.2-Source.tar.gz
+18aee04a7e232e4d821f46ff24da3364 synergy-1.4.10-Source.tar.gz
Added: csw/mgar/pkg/synergy/trunk/files/0001-change-endiness-detection.patch
===================================================================
--- csw/mgar/pkg/synergy/trunk/files/0001-change-endiness-detection.patch (rev 0)
+++ csw/mgar/pkg/synergy/trunk/files/0001-change-endiness-detection.patch 2012-11-07 10:20:27 UTC (rev 19567)
@@ -0,0 +1,28 @@
+From c8fc404bc3377c4a331ef69982d29a5e4a7c0a45 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Wed, 7 Nov 2012 11:10:01 +0100
+Subject: [PATCH] change-endiness-detection
+
+---
+ src/micro/uSynergy.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/micro/uSynergy.h b/src/micro/uSynergy.h
+index e3be71f..41d62be 100644
+--- a/src/micro/uSynergy.h
++++ b/src/micro/uSynergy.h
+@@ -45,9 +45,9 @@ extern "C" {
+ #error "Can't define both USYNERGY_LITTLE_ENDIAN and USYNERGY_BIG_ENDIAN"
+ #elif !defined(USYNERGY_LITTLE_ENDIAN) && !defined(USYNERGY_BIG_ENDIAN)
+ /* Attempt to auto detect */
+- #if defined(__LITTLE_ENDIAN__) || defined(LITTLE_ENDIAN) || (_BYTE_ORDER == _LITTLE_ENDIAN)
++ #if defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN)
+ #define USYNERGY_LITTLE_ENDIAN
+- #elif defined(__BIG_ENDIAN__) || defined(BIG_ENDIAN) || (_BYTE_ORDER == _BIG_ENDIAN)
++ #elif defined(__BIG_ENDIAN__) || defined(_BIG_ENDIAN)
+ #define USYNERGY_BIG_ENDIAN
+ #else
+ #error "Can't detect endian-nes, please defined either USYNERGY_LITTLE_ENDIAN or USYNERGY_BIG_ENDIAN";
+--
+1.7.12
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list