[arch-commits] Commit in nxserver/trunk (PKGBUILD nx-gcc44.patch)

[andyrtr at archlinux.org]

    Date: Friday, July 3, 2009 @ 15:45:21
  Author: andyrtr
Revision: 44739

upgpkg: nxserver 3.3.0-6
    rebuild for libjpeg, added a buildfix

Added:
  nxserver/trunk/nx-gcc44.patch
Modified:
  nxserver/trunk/PKGBUILD

----------------+
 PKGBUILD       |   13 ++++++++-----
 nx-gcc44.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-03 19:41:57 UTC (rev 44738)
+++ PKGBUILD	2009-07-03 19:45:21 UTC (rev 44739)
@@ -4,12 +4,12 @@
 
 pkgname=nxserver
 pkgver=3.3.0
-pkgrel=5
+pkgrel=6
 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' \
+depends=("nx-common>=$pkgver" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=7' \
 	 'libxpm' 'libpng' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2')
 makedepends=('imake')
 source=(
@@ -29,7 +29,8 @@
 NXproto.h.64bit.diff
 # gcc 43 fix
 nxcompsh-gcc43.patch
-nxcompshad-gcc43.patch)
+nxcompshad-gcc43.patch
+nx-gcc44.patch)
 options=(!libtool) 
 
 build() {
@@ -38,6 +39,8 @@
   mkdir -p ${pkgdir}/opt/NX/lib
   patch -Np0 -i ../nxcompsh-gcc43.patch || return 1
   patch -Np0 -i ../nxcompshad-gcc43.patch || return 1
+  patch -Np1 -i ../nx-gcc44.patch || return 1
+  
   cd ${srcdir}/nxcomp
   if [ "$CARCH" = "x86_64" ]; then
     patch -Np1 -i ../NXproto.h.64bit.diff  || return 1
@@ -77,7 +80,6 @@
   cd ${pkgdir}/opt/NX/lib
   ln -s libXcompext.so.3 libXcompext.so.1
 }
-
 md5sums=('954de7b8a3d1e6cd24bdc96db2857f1b'
          '71de8e60c0cdee887e00d1a44f337ad1'
          '6d59de2cbf61430ac513ddfa6b05bc76'
@@ -89,4 +91,5 @@
          '02f051366c4aae96bfefda60d701d8b4'
          '58341ba70dfab92ff38570071fbbf88a'
          'b6c279654dac421fc3dd1a27d66ff53c'
-         '01cea8bc5997ae2c3790cbcb7d624c86')
+         '01cea8bc5997ae2c3790cbcb7d624c86'
+         'c805442f1500d8d6de15ec224f63277e')

Added: nx-gcc44.patch
===================================================================
--- nx-gcc44.patch	                        (rev 0)
+++ nx-gcc44.patch	2009-07-03 19:45:21 UTC (rev 44739)
@@ -0,0 +1,12 @@
+--- 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')
+