[arch-commits] Commit in synergy/trunk (PKGBUILD gcc43.patch)
Stéphane Gaudreault
stephane at archlinux.org
Sat Sep 11 23:41:32 UTC 2010
Date: Saturday, September 11, 2010 @ 19:41:31
Author: stephane
Revision: 90484
upgpkg: synergy 1.3.4-1
update to v1.3.4
Modified:
synergy/trunk/PKGBUILD
Deleted:
synergy/trunk/gcc43.patch
-------------+
PKGBUILD | 37 +++++++---------
gcc43.patch | 133 ----------------------------------------------------------
2 files changed, 17 insertions(+), 153 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-09-11 21:42:38 UTC (rev 90483)
+++ PKGBUILD 2010-09-11 23:41:31 UTC (rev 90484)
@@ -1,36 +1,33 @@
# $Id$
-# Maintainer:
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
# Contributor: Dale Blount <dale at archlinux.org>
pkgname=synergy
-pkgver=1.3.1
-pkgrel=7
-pkgdesc="Share a single mouse and keyboard between multiple pcs"
-url="http://synergy2.sourceforge.net/"
+pkgver=1.3.4
+pkgrel=1
+pkgdesc="Share a single mouse and keyboard between multiple computers"
+url="http://synergy2.sourceforge.net"
arch=('i686' 'x86_64')
depends=('gcc-libs' 'libxtst' 'libxinerama')
license=('GPL2')
makedepends=('libxt') # used by configure to test for libx11...
backup=('etc/synergy.conf')
-source=(http://downloads.sourceforge.net/${pkgname}2/$pkgname-$pkgver.tar.gz
- 'synergys.rc'
- 'gcc43.patch')
-md5sums=('a6e09d6b71cb217f23069980060abf27'
- '056e59b1d04a66820ffa4b53e5ec20bc'
- '255c3f641c5f077e33e284db771220b8')
+source=(http://synergy-plus.googlecode.com/files/${pkgname}-plus-${pkgver}.tar.gz 'synergys.rc')
+md5sums=('2c565afe5f920d363eef38dd97449b73' '056e59b1d04a66820ffa4b53e5ec20bc')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np1 -i "${srcdir}/gcc43.patch" || return 1
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc || return 1
+ cd ${srcdir}/${pkgname}-plus-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc || return 1
make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+}
- install -m755 -d "${pkgdir}/etc"
- install -m644 examples/synergy.conf "${pkgdir}/etc/" || return 1
+package() {
+ cd ${srcdir}/${pkgname}-plus-${pkgver}
+ make DESTDIR=${pkgdir} install || return 1
+ install -m755 -d ${pkgdir}/etc
+ install -m644 examples/synergy.conf ${pkgdir}/etc/ || return 1
install -Dm755 ${srcdir}/synergys.rc ${pkgdir}/etc/rc.d/synergy || return 1
}
+
+# vim: set noexpandtab tabstop=8 shiftwidth=8 textwidth=132 autoindent
Deleted: gcc43.patch
===================================================================
--- gcc43.patch 2010-09-11 21:42:38 UTC (rev 90483)
+++ gcc43.patch 2010-09-11 23:41:31 UTC (rev 90484)
@@ -1,133 +0,0 @@
-diff -ru synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp synergy-1.3.1.patched/lib/arch/CArchDaemonUnix.cpp
---- synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp 2005-04-24 05:02:12.000000000 +0200
-+++ synergy-1.3.1.patched/lib/arch/CArchDaemonUnix.cpp 2008-10-12 15:57:32.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <cstdlib>
-
- //
- // CArchDaemonUnix
-diff -ru synergy-1.3.1/lib/arch/CMultibyte.cpp synergy-1.3.1.patched/lib/arch/CMultibyte.cpp
---- synergy-1.3.1/lib/arch/CMultibyte.cpp 2005-11-30 05:33:24.000000000 +0100
-+++ synergy-1.3.1.patched/lib/arch/CMultibyte.cpp 2008-10-12 15:58:33.000000000 +0200
-@@ -22,6 +22,7 @@
- #if HAVE_LOCALE_H
- # include <locale.h>
- #endif
-+#include <cstdlib>
- #if HAVE_WCHAR_H || defined(_MSC_VER)
- # include <wchar.h>
- #elif __APPLE__
-diff -ru synergy-1.3.1/lib/base/CStringUtil.cpp synergy-1.3.1.patched/lib/base/CStringUtil.cpp
---- synergy-1.3.1/lib/base/CStringUtil.cpp 2005-12-14 18:25:20.000000000 +0100
-+++ synergy-1.3.1.patched/lib/base/CStringUtil.cpp 2008-10-12 15:59:04.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <algorithm>
-+#include <cstring>
-
- //
- // CStringUtil
-diff -ru synergy-1.3.1/lib/client/CClient.cpp synergy-1.3.1.patched/lib/client/CClient.cpp
---- synergy-1.3.1/lib/client/CClient.cpp 2006-03-09 05:07:17.000000000 +0100
-+++ synergy-1.3.1.patched/lib/client/CClient.cpp 2008-10-12 16:03:32.000000000 +0200
-@@ -26,6 +26,8 @@
- #include "CLog.h"
- #include "IEventQueue.h"
- #include "TMethodEventJob.h"
-+#include <cstring>
-+#include <cstdlib>
-
- //
- // CClient
-diff -ru synergy-1.3.1/lib/client/CServerProxy.cpp synergy-1.3.1.patched/lib/client/CServerProxy.cpp
---- synergy-1.3.1/lib/client/CServerProxy.cpp 2006-04-02 03:47:03.000000000 +0200
-+++ synergy-1.3.1.patched/lib/client/CServerProxy.cpp 2008-10-12 16:03:59.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "TMethodEventJob.h"
- #include "XBase.h"
- #include <memory>
-+#include <cstring>
-
- //
- // CServerProxy
-diff -ru synergy-1.3.1/lib/net/CTCPSocket.cpp synergy-1.3.1.patched/lib/net/CTCPSocket.cpp
---- synergy-1.3.1/lib/net/CTCPSocket.cpp 2006-04-02 03:47:03.000000000 +0200
-+++ synergy-1.3.1.patched/lib/net/CTCPSocket.cpp 2008-10-12 15:59:43.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "CArch.h"
- #include "XArch.h"
- #include <string.h>
-+#include <cstdlib>
-
- //
- // CTCPSocket
-diff -ru synergy-1.3.1/lib/platform/CXWindowsScreen.cpp synergy-1.3.1.patched/lib/platform/CXWindowsScreen.cpp
---- synergy-1.3.1/lib/platform/CXWindowsScreen.cpp 2006-04-02 21:16:39.000000000 +0200
-+++ synergy-1.3.1.patched/lib/platform/CXWindowsScreen.cpp 2008-10-12 16:02:25.000000000 +0200
-@@ -27,6 +27,7 @@
- #include "IEventQueue.h"
- #include "TMethodEventJob.h"
- #include <cstring>
-+#include <cstdlib>
- #if X_DISPLAY_MISSING
- # error X11 is required to build synergy
- #else
-diff -ru synergy-1.3.1/lib/server/CClientProxy1_3.cpp synergy-1.3.1.patched/lib/server/CClientProxy1_3.cpp
---- synergy-1.3.1/lib/server/CClientProxy1_3.cpp 2006-02-12 20:53:43.000000000 +0100
-+++ synergy-1.3.1.patched/lib/server/CClientProxy1_3.cpp 2008-10-12 16:04:53.000000000 +0200
-@@ -17,6 +17,7 @@
- #include "CLog.h"
- #include "IEventQueue.h"
- #include "TMethodEventJob.h"
-+#include <cstring>
-
- //
- // CClientProxy1_3
-diff -ru synergy-1.3.1/lib/server/CServer.cpp synergy-1.3.1.patched/lib/server/CServer.cpp
---- synergy-1.3.1/lib/server/CServer.cpp 2006-04-02 03:47:04.000000000 +0200
-+++ synergy-1.3.1.patched/lib/server/CServer.cpp 2008-10-12 16:05:27.000000000 +0200
-@@ -29,6 +29,7 @@
- #include "TMethodEventJob.h"
- #include "CArch.h"
- #include <string.h>
-+#include <cstdlib>
-
- //
- // CServer
-diff -ru synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp synergy-1.3.1.patched/lib/synergy/CPacketStreamFilter.cpp
---- synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp 2005-04-24 05:02:16.000000000 +0200
-+++ synergy-1.3.1.patched/lib/synergy/CPacketStreamFilter.cpp 2008-10-12 16:00:41.000000000 +0200
-@@ -16,6 +16,7 @@
- #include "IEventQueue.h"
- #include "CLock.h"
- #include "TMethodEventJob.h"
-+#include <cstring>
-
- //
- // CPacketStreamFilter
-diff -ru synergy-1.3.1/lib/synergy/IKeyState.cpp synergy-1.3.1.patched/lib/synergy/IKeyState.cpp
---- synergy-1.3.1/lib/synergy/IKeyState.cpp 2006-03-22 06:40:27.000000000 +0100
-+++ synergy-1.3.1.patched/lib/synergy/IKeyState.cpp 2008-10-12 16:01:04.000000000 +0200
-@@ -14,6 +14,7 @@
-
- #include "IKeyState.h"
- #include <string.h>
-+#include <cstdlib>
-
- //
- // IKeyState
-diff -ru synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp synergy-1.3.1.patched/lib/synergy/IPrimaryScreen.cpp
---- synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp 2006-03-22 06:40:27.000000000 +0100
-+++ synergy-1.3.1.patched/lib/synergy/IPrimaryScreen.cpp 2008-10-12 16:01:20.000000000 +0200
-@@ -13,6 +13,7 @@
- */
-
- #include "IPrimaryScreen.h"
-+#include <cstdlib>
-
- //
- // IPrimaryScreen
More information about the arch-commits
mailing list