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

Mon Jun 6 19:21:38 UTC 2011

Date: Monday, June 6, 2011 @ 15:21:37
  Author: andyrtr
Revision: 126704

upgpkg: nxserver 3.5.0-1
upstream update 3.5.0; cleanup

Modified:
  nxserver/trunk/PKGBUILD
Deleted:
  nxserver/trunk/nx-gcc44.patch
  nxserver/trunk/nxcompshad-gcc43.patch

------------------------+
 PKGBUILD               |  110 ++++++++++++++++++++++-------------------------
 nx-gcc44.patch         |   12 -----
 nxcompshad-gcc43.patch |   19 --------
 3 files changed, 53 insertions(+), 88 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2011-06-06 19:04:11 UTC (rev 126703)
+++ PKGBUILD	2011-06-06 19:21:37 UTC (rev 126704)
@@ -3,94 +3,90 @@
 # Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
 
 pkgname=nxserver
-pkgver=3.4.0
-pkgrel=8
+pkgver=3.5.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>=$pkgver" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8'
+depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
 	 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
          'xorg-sessreg')
 makedepends=('imake')
 source=(
 #X11 support programs and libraries
-http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-4.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-7.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-3.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-1.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-1.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
 #X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-16.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-2.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
 #Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-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
+http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
 # gcc 43 fix
-nxcompsh-gcc43.patch
-nxcompshad-gcc43.patch
-nx-gcc44.patch)
+nxcompsh-gcc43.patch)
 options=(!libtool) 
-md5sums=('38a84d4521a41e5ff988a84181ddcaf5'
-         'f45d183360067ede979c18fc964824ab'
-         'bfb758edd51271b31aa6b902557fa0cc'
-         'cba926f2b855231a8fc3e0dabff52855'
-         'ec82183635a6ef627cb19d53d4a004ce'
-         'f94501249ad7d4453524f88ef0cfb1ff'
-         '95ce93520d463a3d18cdd5d19c321e85'
-         '605a8e2a136f89477f0059a0d2af4582'
-         '15deba68e12e13b524a723b49e7ec813'
-         '58341ba70dfab92ff38570071fbbf88a'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '01cea8bc5997ae2c3790cbcb7d624c86'
-         'c805442f1500d8d6de15ec224f63277e')
+md5sums=('54ac7dd8806928b991b0819cf76b37dd'
+         '271cef5b5345b8de77b0f6a0ce1a3b0d'
+         'cf38ec1e5a5f6453946cd387c14f2684'
+         '30a182146479004ec63b8a1b9adccfcf'
+         '7b0f60d5a3c54f22da7d81aac055836e'
+         '84ade443b79ea079380b754aba9d392e'
+         '488bb4d9b8e9f82dc272b4e6e9c57d30'
+         'abde2ccc33e31fc695031c2cfb60f3dd'
+         '90a762dd9eb19c8c97876ad837923857'
+         'b6c279654dac421fc3dd1a27d66ff53c')
 
 build() {
   cd ${srcdir}
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib
-  patch -Np0 -i ${srcdir}/nxcompsh-gcc43.patch || return 1
-  patch -Np0 -i ${srcdir}/nxcompshad-gcc43.patch || return 1
-#  patch -Np1 -i ../nx-gcc44.patch || return 1
-  
+
+  # 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
-
+  make
+  # nxcompshad
   cd ${srcdir}/nxcompshad
   ./configure --prefix=/opt/NX
-  make || return 1
-  cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib
-
+  make
+  # nxcompsh
   cd ${srcdir}/nxcompsh
+  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
   ./configure --prefix=/opt/NX
-  make || return 1
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
-
+  make
+  # nxproxy
   cd ${srcdir}/nxproxy
   ./configure --prefix=/opt/NX
-  make || return 1
-  make prefix=${pkgdir}/opt/NX install || return 1
+  make
+  # nx-X11
+  cd ${srcdir}/nx-X11
+  make World
+  # nxcompext
+  cd ${srcdir}/nxcompext 
+  ./configure --prefix=/opt/NX
+  make
+}
 
+package() {
+  mkdir -p ${pkgdir}/opt/NX/bin
+  mkdir -p ${pkgdir}/opt/NX/lib
+
+  # nxcompshad
+  cd ${srcdir}/nxcompshad
+  cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib
+  # nxproxy
+  cd ${srcdir}/nxproxy
+  make prefix=${pkgdir}/opt/NX install
+  # nx-X11
   cd ${srcdir}/nx-X11
-  make World || return 1
   cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib
   cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib
   cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib
   install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent
   install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth
-
+  # nxcompext
   cd ${srcdir}/nxcompext 
-  ./configure --prefix=/opt/NX
-  make || return 1
   cp -a libXcompext.so* ${pkgdir}/opt/NX/lib
-
-  # fix libXcompext linking
-  cd ${pkgdir}/opt/NX/lib
-  ln -s libXcompext.so.3 libXcompext.so.1
-}
+}
\ No newline at end of file

Deleted: nx-gcc44.patch
===================================================================
--- nx-gcc44.patch	2011-06-06 19:04:11 UTC (rev 126703)
+++ nx-gcc44.patch	2011-06-06 19:21:37 UTC (rev 126704)
@@ -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')
-

Deleted: nxcompshad-gcc43.patch
===================================================================
--- nxcompshad-gcc43.patch	2011-06-06 19:04:11 UTC (rev 126703)
+++ nxcompshad-gcc43.patch	2011-06-06 19:21:37 UTC (rev 126704)
@@ -1,19 +0,0 @@
---- 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.
- 


