Mon Feb 6 23:14:50 UTC 2012

2 files changed, 72 insertions, 4 deletions

diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD
index b26a556c6..bba6b27df 100644
--- a/community/xnc/PKGBUILD
+++ b/community/xnc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58678 2011-11-17 15:02:45Z spupykin $
+# $Id: PKGBUILD 63790 2012-02-05 12:15:33Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xnc
 pkgver=5.0.4
-pkgrel=4
+pkgrel=6
 pkgdesc="X nortern captain file manager"
 arch=(i686 x86_64)
 url="http://xnc.jinr.ru/"
@@ -11,13 +11,18 @@ license=('GPL')
 depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7')
 makedepends=('libxt')
 options=('!makeflags')
-source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
+#source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
+source=(ftp://ftp.archlinux.org/other/community/xnc/xnc-$pkgver.src.tar.gz
+	xnc-gcc44.patch
+	libpng15.patch)
 md5sums=('62446cdfdf5730f125fb351a658c0bd3'
-         'c0037a081824bca691e59a4ec68b6686')
+         'c0037a081824bca691e59a4ec68b6686'
+         '7159af1c645fda860f0e5057100651ad')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/xnc-gcc44.patch
+  patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
   make DESTDIR="$pkgdir" install
diff --git a/community/xnc/libpng15.patch b/community/xnc/libpng15.patch
new file mode 100644
index 000000000..53b941b81
--- /dev/null
+++ b/community/xnc/libpng15.patch
@@ -0,0 +1,63 @@
+diff -wbBur xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c
+--- xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c	2002-08-05 14:43:09.000000000 +0400
++++ xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c	2012-01-19 13:46:48.000000000 +0400
+@@ -138,7 +138,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		IMG_SetError("Error reading the PNG file.");
+ 		goto done;
+ 	}
+@@ -207,9 +207,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -217,7 +217,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		IMG_SetError("Out of memory");
+ 		goto done;
+@@ -252,6 +252,10 @@
+ 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
+ 	png_read_end(png_ptr, info_ptr);
+ 
++	png_colorp plte;
++	int num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
++
+ 	/* Load the palette, if any */
+ 	palette = surface->format->palette;
+ 	if ( palette ) {
+@@ -262,12 +266,12 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else if (num_palette > 0 ) {
++		palette->ncolors = num_palette;
++		for( i=0; i<num_palette; ++i ) {
++		    palette->colors[i].b = plte[i].blue;
++		    palette->colors[i].g = plte[i].green;
++		    palette->colors[i].r = plte[i].red;
+ 		}
+ 	    }
+ 	}