[arch-commits] Commit in nxserver/trunk (3 files)

[Tobias Powalowski]

    Date: Sunday, September 28, 2008 @ 17:26:28
  Author: tpowa
Revision: 13815

upgpkg: nxserver 3.2.0-1

Added:
  nxserver/trunk/nxcompsh-gcc43.patch
  nxserver/trunk/nxcompshad-gcc43.patch
Modified:
  nxserver/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   57 +++++++++++++++++++++++++----------------------
 nxcompsh-gcc43.patch   |   19 +++++++++++++++
 nxcompshad-gcc43.patch |   19 +++++++++++++++
 3 files changed, 69 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-28 21:23:59 UTC (rev 13814)
+++ PKGBUILD	2008-09-28 21:26:28 UTC (rev 13815)
@@ -2,37 +2,41 @@
 # Maintainer Tobias Powalowski <tpowa at archlinux.org>
 # Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
 pkgname=nxserver
-pkgver=3.1.0
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
 arch=(i686 x86_64)
 url="http://nomachine.com/"
 license=('GPL')
-depends=('nx-common>=3.1.0' 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg' \
+depends=('nx-common>=$pkgver' 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg' \
 	 'libxpm' 'libpng' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2')
 makedepends=('imake')
 source=(\
 #X11 support programs and libraries
-http://64.34.161.181/download/3.1.0/sources/nx-X11-3.1.0-1.tar.gz \
-http://64.34.161.181/download/3.1.0/sources/nxwin-3.1.0-1.tar.gz \
-http://64.34.161.181/download/3.1.0/sources/nxauth-3.1.0-1.tar.gz \
-http://64.34.161.181/download/3.1.0/sources/nxcomp-3.1.0-4.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-4.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz \
 #X11 Agent sources
-http://64.34.161.181/download/3.1.0/sources/nxagent-3.1.0-2.tar.gz \
-http://64.34.161.181/download/3.1.0/sources/nxcompsh-3.1.0-1.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-10.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz \
 #Compression libs and proxy sources
-http://64.34.161.181/download/3.1.0/sources/nxproxy-3.1.0-2.tar.gz \
-http://64.34.161.181/download/3.1.0/sources/nxcompext-3.1.0-2.tar.gz \
-http://64.34.161.181/download/3.1.0/sources/nxcompshad-3.1.0-2.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-3.tar.gz \
 #64bit fixes
-NXproto.h.64bit.diff)
-options=(!libtool)
+NXproto.h.64bit.diff
+# gcc 43 fix
+nxcompsh-gcc43.patch
+nxcompshad-gcc43.patch)
+options=(!libtool) 
 
 build() {
   cd $startdir/src
   mkdir -p $startdir/pkg/opt/NX/bin
-  mkdir -p $startdir/pkg/opt/NX/lib 
-
+  mkdir -p $startdir/pkg/opt/NX/lib
+  patch -Np0 -i ../nxcompsh-gcc43.patch || return 1
+  patch -Np0 -i ../nxcompshad-gcc43.patch || return 1
   cd $startdir/src/nxcomp
   if [ "$CARCH" = "x86_64" ]; then
     patch -Np1 -i ../NXproto.h.64bit.diff  || return 1
@@ -72,14 +76,15 @@
   cd $startdir/pkg/opt/NX/lib
   ln -s libXcompext.so.3 libXcompext.so.1
 }
-
-md5sums=('e3abbf75152037ac02b61bf991a2dfcc'
-         '5a06b0a0b4f8b82cfb00d4005d8e6cfc'
-         '75ee1a4140322645fcd2a8303cd306c7'
-         '83b1d33085b04b338ec46f0c86ed5c1e'
-         'e14977404b8abeb5de137bf16bf234a2'
-         '64e52068bf83caaae831e059c8c077df'
-         '6e2abffa850d89586c8df922e2f218bd'
-         '746c2a65978a622d301eb2c5bea0b94c'
-         '167af862593a494237a1a0b4adbbb600'
-         '58341ba70dfab92ff38570071fbbf88a')
+md5sums=('0a969199c77a604a488794c56176000f'
+         '3a96ece73da0699f1e6eb7165b16d141'
+         '18519f2bcf30b10b766a60926fbe1017'
+         '5ea64a557c770d9f5cc4b9a7a9d1343c'
+         '9123c0bbd184cdeb343c7c6f1e267161'
+         '57cc9cb3acebf792383bfcc50e715d48'
+         'ac31e8f2f112e3720f3c00cec67c0734'
+         'cd1296ebd24b1d7c4f82537a395ad6e8'
+         '6edfa4f65f579306f05af2451249c2bf'
+         '58341ba70dfab92ff38570071fbbf88a'
+         'b6c279654dac421fc3dd1a27d66ff53c'
+         '01cea8bc5997ae2c3790cbcb7d624c86')

Added: nxcompsh-gcc43.patch
===================================================================
--- nxcompsh-gcc43.patch	                        (rev 0)
+++ nxcompsh-gcc43.patch	2008-09-28 21:26:28 UTC (rev 13815)
@@ -0,0 +1,19 @@
+--- nxcompsh/Misc.h~	2007-06-04 13:39:49.000000000 +0200
++++ nxcompsh/Misc.h	2008-04-12 12:46:24.000000000 +0200
+@@ -18,10 +18,12 @@
+ #ifndef Misc_H
+ #define Misc_H
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
++
++using namespace std;
+ 
+ //
+ // Error handling macros.
+ 

Added: nxcompshad-gcc43.patch
===================================================================
--- nxcompshad-gcc43.patch	                        (rev 0)
+++ nxcompshad-gcc43.patch	2008-09-28 21:26:28 UTC (rev 13815)
@@ -0,0 +1,19 @@
+--- nxcompshad/Misc.h~	2007-06-04 13:39:49.000000000 +0200
++++ nxcompshad/Misc.h	2008-04-12 12:46:24.000000000 +0200
+@@ -18,10 +18,12 @@
+ #ifndef Misc_H
+ #define Misc_H
+ 
+-#include <iostream>
++#include <iostream>
+ 
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
++
++using namespace std;
+ 
+ //
+ // Error handling macros.
+