Thu Jun 9 22:46:45 UTC 2011

2 files changed, 57 insertions, 42 deletions

diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD
index ae282c3c4..85fc78ce6 100644
--- a/extra/nx-common/PKGBUILD
+++ b/extra/nx-common/PKGBUILD
@@ -1,58 +1,54 @@
-# $Id: PKGBUILD 75689 2010-04-02 17:16:35Z andyrtr $
-# Maintainer Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 126698 2011-06-06 18:56:52Z andyrtr $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
+
 pkgname=nx-common
-pkgver=3.4.0
-pkgrel=4
+pkgver=3.5.0
+pkgrel=1
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nomachine.com/"
-depends=('libjpeg>=8' 'libpng>=1.4.0' 'openssl>=1.0.0' 'gcc-libs' 'audiofile' 'alsa-lib' 'bash')
-source=(\
-#Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz \
-http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz \
-# ESD Support
-http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-2.tar.gz
-# 64bit fixes
-NXproto.h.64bit.diff
-nx-gcc44.patch)
+depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash')
+makedepends=('xorg-server-devel')
+source=( #Compression libs and proxy sources
+	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz
+	http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
+	http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz
+	nxcompsh-gcc43.patch)
 options=(!libtool)
-md5sums=('cba926f2b855231a8fc3e0dabff52855'
-         '18b81d850223ea84de244f8a9509c4b1'
-         '65d55f2a86baa59343432261cabd52ec'
-         '58341ba70dfab92ff38570071fbbf88a'
-         'c805442f1500d8d6de15ec224f63277e')
+md5sums=('30a182146479004ec63b8a1b9adccfcf'
+         '84ade443b79ea079380b754aba9d392e'
+         '9f13262bc0bf5187fcc7e22924955bc7'
+         'b6c279654dac421fc3dd1a27d66ff53c')
 
 build() {
-  cd ${srcdir}
-#  patch -Np1 -i ${srcdir}/nx-gcc44.patch
- 
+  # nxcomp
+  cd ${srcdir}/nxcomp
+  ./configure --prefix=/opt/NX
+  make
+  # nxcompsh
+  cd ${srcdir}/nxcompsh
+  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
+  ./configure --prefix=/opt/NX
+  make
+  # nxssh
+  cd ${srcdir}/nxssh
+  ./configure --prefix=/opt/NX
+  make
+}
+
+package() {
   mkdir -p ${pkgdir}/opt/NX/bin
   mkdir -p ${pkgdir}/opt/NX/lib 
 
+  # nxcomp
   cd ${srcdir}/nxcomp
-  if [ "$CARCH" = "x86_64" ]; then
-    patch -Np1 -i ../NXproto.h.64bit.diff  || return 1
-  fi
-  
-  ./configure --prefix=/opt/NX
-  make || return 1
-  cp -a libXcomp.so.* ${pkgdir}/opt/NX/lib
-  cd ${pkgdir}/opt/NX/lib
-  ln -s libXcomp.so.1 libXcomp.so
-
+  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
+  # nxcompsh
+  cd ${srcdir}/nxcompsh
+  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
+  # nxssh
   cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
-  make || return 1
   install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
- 
-  cd ${srcdir}/nxesd
-  ./configure --prefix=/opt/NX
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  # fix libxcomp linking
-  cd ${pkgdir}/opt/NX/lib
-  ln -s libXcomp.so.3 libXcomp.so.1
 }
diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch
new file mode 100644
index 000000000..681a0dab5
--- /dev/null
+++ b/extra/nx-common/nxcompsh-gcc43.patch
@@ -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.
+