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

[andyrtr at archlinux.org]

    Date: Friday, July 3, 2009 @ 15:11:59
  Author: andyrtr
Revision: 44734

upgpkg: nx-common 3.3.0-3
    rebuild for libjpeg, added a buildfix

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-03 19:07:54 UTC (rev 44733)
+++ PKGBUILD	2009-07-03 19:11:59 UTC (rev 44734)
@@ -3,12 +3,12 @@
 # Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
 pkgname=nx-common
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://nomachine.com/"
-depends=('libjpeg' 'libpng' 'openssl>=0.9.8g' 'gcc-libs' 'audiofile' 'alsa-lib' 'bash')
+depends=('libjpeg>=7' 'libpng' 'openssl>=0.9.8g' 'gcc-libs' 'audiofile' 'alsa-lib' 'bash')
 source=(\
 #Compression libs and proxy sources
 http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-4.tar.gz \
@@ -16,11 +16,13 @@
 # ESD Support
 http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-1.tar.gz
 # 64bit fixes
-NXproto.h.64bit.diff)
+NXproto.h.64bit.diff
+nx-gcc44.patch)
 options=(!libtool)
 
 build() {
   cd ${srcdir}
+  patch -Np1 -i ${srcdir}/nx-gcc44.patch
  
   mkdir -p ${pkgdir}/opt/NX/bin
   mkdir -p ${pkgdir}/opt/NX/lib 
@@ -29,6 +31,7 @@
   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
@@ -48,8 +51,8 @@
   cd ${pkgdir}/opt/NX/lib
   ln -s libXcomp.so.3 libXcomp.so.1
 }
-
 md5sums=('0eb3866f1173767f185a1d62dd51dba0'
          'e9bb4c1cd61c42db9626894845fcf3f7'
          '358c449a459a2d7d66e70b61b72baa72'
-         '58341ba70dfab92ff38570071fbbf88a')
+         '58341ba70dfab92ff38570071fbbf88a'
+         'c805442f1500d8d6de15ec224f63277e')

Added: nx-gcc44.patch
===================================================================
--- nx-gcc44.patch	                        (rev 0)
+++ nx-gcc44.patch	2009-07-03 19:11:59 UTC (rev 44734)
@@ -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')
+