Mon Feb 6 23:14:50 UTC 2012

2 files changed, 33 insertions, 13 deletions

diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 782eb0534..d0b06469d 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 26451 2010-09-15 18:28:06Z schuay $
+# $Id: PKGBUILD 63759 2012-02-05 12:12:25Z ibiru $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
 # Adopted: royrocks <royrocks13@gmail.com>
 pkgname=tuxpaint
 pkgver=0.9.21
-pkgrel=4
+pkgrel=5
 pkgdesc="Tux Paint is a free drawing program designed for young children."
 arch=('i686' 'x86_64')
 url="http://www.tuxpaint.org"
 license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
 depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg')
-source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz)
-md5sums=('a88401d1860648098eeed819cff038fa')
-sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4')
+source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch)
+md5sums=('a88401d1860648098eeed819cff038fa'
+         '11d11119b3316c13f7b7a77048317bce')
+sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4'
+          '5595a65ebabc46bebd2d0670589effc8dbdd4e0c')
 
 build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
 
  # python2 fix
  for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
     sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
  done
 
+ patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
+ sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile
  echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop
  make PREFIX=/usr
 }
 
 package() {
- cd $srcdir/$pkgname-$pkgver
- make PREFIX=/usr DESTDIR=$startdir/pkg CONFDIR=$pkgdir/etc MAN_PREFIX=$pkgdir/usr/share/man  X11_ICON_PREFIX=$pkgdir/usr/share/pixmaps KDE_PREFIX="" KDE_ICON_PREFIX="" install
- install -D -m 644 $srcdir/$pkgname-$pkgver/src/tuxpaint.desktop $pkgdir/usr/share/applications/tuxpaint.desktop
- chmod -R 644 $pkgdir/usr/share/doc/tuxpaint-dev/*
- chmod 755 $pkgdir/usr/share/doc/tuxpaint-dev/html
- mkdir -p $pkgdir/etc/tuxpaint
- mv $pkgdir/etc/tuxpaint.conf $pkgdir/etc/tuxpaint/
+ cd "$srcdir/$pkgname-$pkgver"
+ make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install
+ chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/*
+ chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html"
 }
diff --git a/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch b/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
new file mode 100644
index 000000000..25e80cd2a
--- /dev/null
+++ b/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
@@ -0,0 +1,19 @@
+http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
+No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
+
+--- src/tuxpaint.c	2011/07/29 21:27:39	1.828
++++ src/tuxpaint.c	2011/08/08 17:59:12	1.829
+@@ -13425,12 +13425,7 @@
+       {
+ 	png_init_io(png_ptr, fi);
+ 
+-	info_ptr->width = surf->w;
+-	info_ptr->height = surf->h;
+-	info_ptr->bit_depth = 8;
+-	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-	info_ptr->interlace_type = 1;
+-	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ 				   PNG_sRGB_INTENT_PERCEPTUAL);