Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (9a8cb0630df62e785ef96e7d38aab45ac83f80f6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (9a8cb0630df62e785ef96e7d38aab45ac83f80f6)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (9a8cb0630df62e785ef96e7d38aab45ac83f80f6)
  • Date: Wed, 30 Nov 2011 16:40:45 -0600
GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

x11/synergy/DEPENDS | 6 -
x11/synergy/DETAILS | 13 ++--
x11/synergy/HISTORY | 12 +++
x11/synergy/INSTALL | 10 ++-
x11/synergy/PRE_BUILD | 5 -
x11/synergy/synergy-1.3.8-Source.tar.gz.sig |binary
x11/synergy/synergy_gcc43.patch | 90
----------------------------
7 files changed, 29 insertions(+), 107 deletions(-)

New commits:
commit 9a8cb0630df62e785ef96e7d38aab45ac83f80f6
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

synergy: => 1.3.8
updated website, fixed source_url
converted to guru signed verification

build with cmake_build

removed PRE_BUILD, gcc43 patch no longer needed

added depends cmake and python, removed automake and autoconfig

diff --git a/x11/synergy/DEPENDS b/x11/synergy/DEPENDS
index 63f1137..413f42f 100755
--- a/x11/synergy/DEPENDS
+++ b/x11/synergy/DEPENDS
@@ -1,8 +1,8 @@
depends xorg-server &&
-depends autoconf &&
-depends automake &&
+depends cmake &&
depends -sub CXX gcc &&
depends libxtst &&
depends libxinerama &&
depends libxext &&
-depends libx11
+depends libx11 &&
+depends python
diff --git a/x11/synergy/DETAILS b/x11/synergy/DETAILS
index 57be347..7dac6f6 100755
--- a/x11/synergy/DETAILS
+++ b/x11/synergy/DETAILS
@@ -1,10 +1,11 @@
SPELL=synergy
- VERSION=1.3.1
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}2/$SOURCE
-
SOURCE_HASH=sha512:6596d7e36d57f5567cc9e13f361f40b15062a308400a43c37834ad3e4a856cfd6b85bd81f91b49cfc4d68c148ce545604243883f242cf5f2a53d9eed2213b908
- WEB_SITE=http://synergy2.sourceforge.net/
+ VERSION=1.3.8
+ SOURCE=$SPELL-$VERSION-Source.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-Source
+ SOURCE_URL[0]=http://$SPELL.googlecode.com/files/$SOURCE
+#
SOURCE_HASH=sha512:771d233c6783d72a4b922b0d18e76bcc6c94d7ec3f59d78f9b852123334134aff3ed5e3cfc9693cca3449a522f65651f0926d628270f11056947e75f996535c5
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ WEB_SITE=http://synergy-foss.org
ENTERED=20021018
LICENSE[0]=GPL
DOCS="AUTHORS BUGS ChangeLog COPYING HISTORY INSTALL NEWS
PORTING README TODO"
diff --git a/x11/synergy/HISTORY b/x11/synergy/HISTORY
index c74161d..0d8cf71 100644
--- a/x11/synergy/HISTORY
+++ b/x11/synergy/HISTORY
@@ -1,3 +1,15 @@
+2011-11-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0], sourceforge -> googlecode
+ updated spell to 1.3.8
+ updated website
+ change to guru signed gpg verfication
+ * INSTALL: make install is not currently working,
+ so manually install files
+ * synergy_gcc43.patch: removed, no longer needed
+ * BUILD: use cmake_build now
+ * PRE_BUILD: removed, no longer needed
+ * DEPENDS: removed automake and autoconfig, added cmake and python
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/x11/synergy/INSTALL b/x11/synergy/INSTALL
index 55b27ae..6c3adf0 100755
--- a/x11/synergy/INSTALL
+++ b/x11/synergy/INSTALL
@@ -1,6 +1,10 @@
-default_install &&
-cp examples/synergy.conf \
- /etc/synergy.conf.sample &&
+#default_install &&
+
+cd ${SOURCE_DIRECTORY} &&
+install -m 755 bin/synergyc ${INSTALL_ROOT}/usr/bin &&
+install -m 755 bin/synergys ${INSTALL_ROOT}/usr/bin &&
+
+install -m 644 doc/synergy.conf.example ${INSTALL_ROOT}/etc &&

#
# For some reason, Sorcery would not install
diff --git a/x11/synergy/PRE_BUILD b/x11/synergy/PRE_BUILD
deleted file mode 100755
index d82fcae..0000000
--- a/x11/synergy/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < ${SCRIPT_DIRECTORY}/synergy_gcc43.patch &&
-sed -i "s:\-Werror::g" acinclude.m4 &&
-autoreconf -f
diff --git a/x11/synergy/synergy-1.3.8-Source.tar.gz.sig
b/x11/synergy/synergy-1.3.8-Source.tar.gz.sig
new file mode 100644
index 0000000..630b87b
Binary files /dev/null and b/x11/synergy/synergy-1.3.8-Source.tar.gz.sig
differ
diff --git a/x11/synergy/synergy_gcc43.patch b/x11/synergy/synergy_gcc43.patch
deleted file mode 100644
index 7f27736..0000000
--- a/x11/synergy/synergy_gcc43.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur /lib/arch/CArchDaemonUnix.cpp lib/arch/CArchDaemonUnix.cpp
---- lib/arch/CArchDaemonUnix.cpp 2005-04-23 23:02:12.000000000 -0400
-+++ lib/arch/CArchDaemonUnix.cpp 2010-03-13 05:30:37.949473285 -0500
-@@ -19,6 +19,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <cstdlib>
-
- //
- // CArchDaemonUnix
-diff -Naur /lib/arch/CMultibyte.cpp lib/arch/CMultibyte.cpp
---- lib/arch/CMultibyte.cpp 2005-11-29 23:33:24.000000000 -0500
-+++ lib/arch/CMultibyte.cpp 2010-03-13 05:51:56.399633465 -0500
-@@ -19,6 +19,7 @@
- #include "CArch.h"
- #include <limits.h>
- #include <string.h>
-+#include <cstdlib>
- #if HAVE_LOCALE_H
- # include <locale.h>
- #endif
-diff -Naur /lib/base/CStringUtil.cpp lib/base/CStringUtil.cpp
---- lib/base/CStringUtil.cpp 2005-12-14 12:25:20.000000000 -0500
-+++ lib/base/CStringUtil.cpp 2010-03-13 05:37:56.222451090 -0500
-@@ -20,6 +20,8 @@
- #include <cstdio>
- #include <cstdlib>
- #include <algorithm>
-+#include <climits>
-+#include <cstring>
-
- //
- // CStringUtil
-diff -Naur /lib/net/CTCPSocket.cpp lib/net/CTCPSocket.cpp
---- lib/net/CTCPSocket.cpp 2006-04-01 20:47:03.000000000 -0500
-+++ lib/net/CTCPSocket.cpp 2010-03-13 05:54:29.955407790 -0500
-@@ -24,6 +24,7 @@
- #include "CArch.h"
- #include "XArch.h"
- #include <string.h>
-+#include <cstdlib>
-
- //
- // CTCPSocket
-diff -Naur /lib/synergy/CPacketStreamFilter.cpp
lib/synergy/CPacketStreamFilter.cpp
---- lib/synergy/CPacketStreamFilter.cpp 2005-04-23 23:02:16.000000000
-0400
-+++ lib/synergy/CPacketStreamFilter.cpp 2010-03-13 05:57:52.839459079
-0500
-@@ -16,6 +16,7 @@
- #include "IEventQueue.h"
- #include "CLock.h"
- #include "TMethodEventJob.h"
-+#include <cstring>
-
- //
- // CPacketStreamFilter
-diff -Naur /lib/synergy/IKeyState.cpp lib/synergy/IKeyState.cpp
---- lib/synergy/IKeyState.cpp 2006-03-22 00:40:27.000000000 -0500
-+++ lib/synergy/IKeyState.cpp 2010-03-13 06:02:51.155507908 -0500
-@@ -14,6 +14,7 @@
-
- #include "IKeyState.h"
- #include <string.h>
-+#include <cstdlib>
-
- //
- // IKeyState
-diff -Naur /lib/synergy/IPrimaryScreen.cpp lib/synergy/IPrimaryScreen.cpp
---- lib/synergy/IPrimaryScreen.cpp 2006-03-22 00:40:27.000000000 -0500
-+++ lib/synergy/IPrimaryScreen.cpp 2010-03-13 06:03:26.740507973 -0500
-@@ -13,6 +13,7 @@
- */
-
- #include "IPrimaryScreen.h"
-+#include <cstdlib>
-
- //
- // IPrimaryScreen
-diff -Naur /lib/synergy/OptionTypes.h lib/synergy/OptionTypes.h
---- lib/synergy/OptionTypes.h 2005-08-03 22:08:25.000000000 -0400
-+++ lib/synergy/OptionTypes.h 2010-03-13 06:07:26.538642237 -0500
-@@ -17,6 +17,8 @@
-
- #include "BasicTypes.h"
- #include "stdvector.h"
-+#include <cstdlib>
-+#include <cstring>
-
- //! Option ID
- /*!


  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (9a8cb0630df62e785ef96e7d38aab45ac83f80f6), Sukneet Basuta, 11/30/2011

Archive powered by MHonArc 2.6.24.

Top of Page