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

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Jan 20 21:32:17 UTC 2012


    Date: Friday, January 20, 2012 @ 16:32:17
  Author: andyrtr
Revision: 147027

upgpkg: nxserver 3.5.0-5

libpng rebuild

Added:
  nxserver/trunk/nx-3.5.0-libpng15.patch
Modified:
  nxserver/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 +++++++----
 nx-3.5.0-libpng15.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-20 21:25:43 UTC (rev 147026)
+++ PKGBUILD	2012-01-20 21:32:17 UTC (rev 147027)
@@ -4,13 +4,13 @@
 
 pkgname=nxserver
 pkgver=3.5.0
-pkgrel=4
+pkgrel=5
 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" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
-	 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
+	 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
          'xorg-sessreg')
 makedepends=('imake')
 source=(
@@ -27,7 +27,8 @@
 http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
 http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
 # gcc 43 fix
-nxcompsh-gcc43.patch)
+nxcompsh-gcc43.patch
+nx-3.5.0-libpng15.patch)
 options=(!libtool) 
 md5sums=('12060433a74ac61a1c776d1d6d136117'
          '84c7f1575d9a1506370125ed050514ab'
@@ -38,13 +39,15 @@
          '488bb4d9b8e9f82dc272b4e6e9c57d30'
          'abde2ccc33e31fc695031c2cfb60f3dd'
          '90a762dd9eb19c8c97876ad837923857'
-         'b6c279654dac421fc3dd1a27d66ff53c')
+         'b6c279654dac421fc3dd1a27d66ff53c'
+         '2966353cabb96829eab291212ef078dc')
 
 build() {
   cd ${srcdir}
 
   # nxcomp   
   cd ${srcdir}/nxcomp
+  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
   ./configure --prefix=/opt/NX
   make
   # nxcompshad

Added: nx-3.5.0-libpng15.patch
===================================================================
--- nx-3.5.0-libpng15.patch	                        (rev 0)
+++ nx-3.5.0-libpng15.patch	2012-01-20 21:32:17 UTC (rev 147027)
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
++++ nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+ 
+   png_read_info(pngPtr, infoPtr);
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -565,7 +565,7 @@
+ 
+   png_read_info( pngPtr, infoPtr ) ;
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -709,7 +709,7 @@
+   png_read_info(pngPtr, infoPtr) ;
+ 
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }




More information about the arch-commits mailing list