[arch-commits] Commit in synergy/repos (3 files)

Sun Oct 12 17:26:04 UTC 2008

Date: Sunday, October 12, 2008 @ 13:26:04
  Author: jgc
Revision: 15111

Fix svn conflict

Added:
  synergy/repos/extra-x86_64/gcc43.patch
    (from rev 15071, synergy/trunk/gcc43.patch)
Modified:
  synergy/repos/extra-x86_64/	(properties)
  synergy/repos/extra-x86_64/PKGBUILD

-------------+
 PKGBUILD    |   23 +++++-----
 gcc43.patch |  133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 10 deletions(-)


Property changes on: synergy/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /synergy/trunk:1
   + /synergy/trunk:1-15110

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2008-10-12 17:22:24 UTC (rev 15110)
+++ extra-x86_64/PKGBUILD	2008-10-12 17:26:04 UTC (rev 15111)
@@ -3,20 +3,23 @@
 
 pkgname=synergy
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="share a single mouse and keyboard between multiple pcs"
-arch=(i686 x86_64)
-depends=(gcc libxtst libsm libxinerama)
+arch=('i686' 'x86_64')
+depends=(gcc-libs libxtst libsm libxinerama)
 backup=(etc/synergy.conf)
 url="http://synergy2.sourceforge.net/"
-source=(http://easynews.dl.sourceforge.net/sourceforge/synergy2/$pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/synergy2/$pkgname-$pkgver.tar.gz
+	gcc43.patch)
+license=('GPL2')
 md5sums=('a6e09d6b71cb217f23069980060abf27')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
-	make || return 1
-	make prefix=$startdir/pkg/usr install
-	mkdir $startdir/pkg/etc
-	install -m644 examples/synergy.conf $startdir/pkg/etc/synergy.conf
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gcc43.patch" || return 1
+  ./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
 }

Copied: synergy/repos/extra-x86_64/gcc43.patch (from rev 15071, synergy/trunk/gcc43.patch)
===================================================================
--- extra-x86_64/gcc43.patch	                        (rev 0)
+++ extra-x86_64/gcc43.patch	2008-10-12 17:26:04 UTC (rev 15111)
@@ -0,0 +1,133 @@
+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


