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

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Jan 20 21:11:30 UTC 2012


    Date: Friday, January 20, 2012 @ 16:11:29
  Author: andyrtr
Revision: 147023

upgpkg: nx-common 3.5.0-3

libpng rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-20 20:50:51 UTC (rev 147022)
+++ PKGBUILD	2012-01-20 21:11:29 UTC (rev 147023)
@@ -4,32 +4,37 @@
 
 pkgname=nx-common
 pkgver=3.5.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-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash')
+depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' '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-2.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-2.tar.gz
-	nxcompsh-gcc43.patch)
+	nxcompsh-gcc43.patch
+	nx-3.5.0-libpng15.patch)
 options=(!libtool)
 md5sums=('ad8c0f133122c6d07732ca69c8759410'
          '84ade443b79ea079380b754aba9d392e'
          'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c')
+         'b6c279654dac421fc3dd1a27d66ff53c'
+         '2966353cabb96829eab291212ef078dc')
 
 build() {
   # nxcomp
   cd ${srcdir}/nxcomp
+  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
+
   ./configure --prefix=/opt/NX
   make
   # nxcompsh
   cd ${srcdir}/nxcompsh
   patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
+ 
   ./configure --prefix=/opt/NX
   make
   # nxssh

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:11:29 UTC (rev 147023)
@@ -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