Date: Monday, June 6, 2011 @ 14:56:52 Author: andyrtr Revision: 126698
upgpkg: nx-common 3.5.0-1 upstream update 3.5.0; move nxcompsh to the common pkg; cleanup; remove that ugly symlink .so.1 - no need for this Added: nx-common/trunk/nxcompsh-gcc43.patch Modified: nx-common/trunk/PKGBUILD Deleted: nx-common/trunk/nx-gcc44.patch ----------------------+ PKGBUILD | 78 +++++++++++++++++++++++-------------------------- nx-gcc44.patch | 12 ------- nxcompsh-gcc43.patch | 19 +++++++++++ 3 files changed, 56 insertions(+), 53 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-06 16:11:30 UTC (rev 126697) +++ PKGBUILD 2011-06-06 18:56:52 UTC (rev 126698) @@ -1,58 +1,54 @@ # $Id$ -# Maintainer Tobias Powalowski <[email protected]> +# Maintainer: Tobias Powalowski <[email protected]> # Contributed: eliott <[email protected]>, Andre Naumann <[email protected]> + 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 } Deleted: nx-gcc44.patch =================================================================== --- nx-gcc44.patch 2011-06-06 16:11:30 UTC (rev 126697) +++ nx-gcc44.patch 2011-06-06 18:56:52 UTC (rev 126698) @@ -1,12 +0,0 @@ ---- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200 -+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200 -@@ -10979,7 +10979,7 @@ - packMethod == PACK_LOSSLESS || - packMethod == PACK_ADAPTIVE) - { -- char *dash = rindex(opt, '-'); -+ const char *dash = rindex(opt, '-'); - - if (dash != NULL && strlen(dash) == 2 && - *(dash + 1) >= '0' && *(dash + 1) <= '9') - Added: nxcompsh-gcc43.patch =================================================================== --- nxcompsh-gcc43.patch (rev 0) +++ nxcompsh-gcc43.patch 2011-06-06 18:56:52 UTC (rev 126698) @@ -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. +
