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

[Eric Bélanger]

    Date: Thursday, February 26, 2009 @ 02:55:05
  Author: eric
Revision: 27819

fixed svn conflict

Added:
  vnc/repos/extra-x86_64/vnc-gcc43.diff
    (from rev 27818, vnc/trunk/vnc-gcc43.diff)
Modified:
  vnc/repos/extra-x86_64/	(properties)
  vnc/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   32 +++++++++++++-------------------
 vnc-gcc43.diff |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 19 deletions(-)


Property changes on: vnc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /vnc/trunk:1
   + /vnc/trunk:1-27818

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-26 07:48:52 UTC (rev 27818)
+++ extra-x86_64/PKGBUILD	2009-02-26 07:55:05 UTC (rev 27819)
@@ -3,30 +3,24 @@
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=vnc
-pkgver=4.1.2
-origver=4_1_2
+pkgver=4.1.3
 pkgrel=1
 pkgdesc="The original open-source cross-platform remote control solution (without xvnc)"
-arch=(i686 x86_64)
-#source=(http://www.realvnc.com/dist/free4/src/unix/$pkgname-$origver-unixsrc.tar.gz)
-
+arch=('i686' 'x86_64')
 url="http://www.realvnc.com"
-depends=('gcc' 'libxtst' 'libsm')
+license=('GPL')
+depends=('gcc-libs' 'libxtst' 'libsm')
 conflicts=('tightvnc')
-build() {
-  cd $startdir/src/ && rm *
-  wget "http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&filetype=tar_gz&haveDetails=1&acceptLicense=1"
+source=('http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&filetype=tar_gz&haveDetails=1&acceptLicense=1' vnc-gcc43.diff)
+md5sums=('a119f3c75ad2767c0588260e2abe39be' '6cda2734352ce274cffcf304dc8a49b3')
 
-  tar xvf download.cgi*
-  cd $startdir/src/$pkgname-$origver-unixsrc/unix || return 1
-
+build() {
+  cd $srcdir/$pkgname-${pkgver//./_}-unixsrc
+  patch -p1 < ../vnc-gcc43.diff || return 1
+  cd unix
+  ./configure --prefix=/usr || return 1
   # making vnc (without Xvnc)
-  ./configure || return 1
   make || return 1
-
-  # installling:
-  mkdir -p $startdir/pkg/usr/{bin,man/man1}
-  ./vncinstall $startdir/pkg/usr/bin $startdir/pkg/usr/man
-
+  install -d $pkgdir/usr/{bin,share/man/man1}
+  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
 }
-

Copied: vnc/repos/extra-x86_64/vnc-gcc43.diff (from rev 27818, vnc/trunk/vnc-gcc43.diff)
===================================================================
--- extra-x86_64/vnc-gcc43.diff	                        (rev 0)
+++ extra-x86_64/vnc-gcc43.diff	2009-02-26 07:55:05 UTC (rev 27819)
@@ -0,0 +1,33 @@
+diff -Naur vnc-4_1_3-unixsrc/common/network/TcpSocket.cxx vnc-4_1_3-unixsrc-new/common/network/TcpSocket.cxx
+--- vnc-4_1_3-unixsrc/common/network/TcpSocket.cxx	2008-10-16 11:16:20.000000000 -0400
++++ vnc-4_1_3-unixsrc-new/common/network/TcpSocket.cxx	2009-02-26 00:46:38.000000000 -0500
+@@ -35,6 +35,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <fcntl.h>
++#include <cstdlib>
+ #endif
+ 
+ #include <network/TcpSocket.h>
+diff -Naur vnc-4_1_3-unixsrc/unix/tx/TXImage.cxx vnc-4_1_3-unixsrc-new/unix/tx/TXImage.cxx
+--- vnc-4_1_3-unixsrc/unix/tx/TXImage.cxx	2008-10-16 11:16:21.000000000 -0400
++++ vnc-4_1_3-unixsrc-new/unix/tx/TXImage.cxx	2009-02-26 00:47:53.000000000 -0500
+@@ -33,6 +33,7 @@
+ #include <rfb/LogWriter.h>
+ #include "TXWindow.h"
+ #include "TXImage.h"
++#include <cstdlib>
+ 
+ using namespace rfb;
+ 
+diff -Naur vnc-4_1_3-unixsrc/unix/x0vncserver/Image.cxx vnc-4_1_3-unixsrc-new/unix/x0vncserver/Image.cxx
+--- vnc-4_1_3-unixsrc/unix/x0vncserver/Image.cxx	2008-10-16 11:16:21.000000000 -0400
++++ vnc-4_1_3-unixsrc-new/unix/x0vncserver/Image.cxx	2009-02-26 00:47:29.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include <X11/extensions/XShm.h>
+ #include "Image.h"
+ #include <list>
++#include <cstdlib>
+ 
+ class ImageCleanup {
+ public: