Date: Monday, April 29, 2013 @ 13:23:59 Author: foutrelis Revision: 89420
archrelease: copy trunk to community-staging-x86_64, community-staging-i686 Added: tuxpaint/repos/community-staging-i686/ tuxpaint/repos/community-staging-i686/PKGBUILD (from rev 89419, tuxpaint/trunk/PKGBUILD) tuxpaint/repos/community-staging-i686/tuxpaint-0.9.21-libpng1.5.patch (from rev 89419, tuxpaint/trunk/tuxpaint-0.9.21-libpng1.5.patch) tuxpaint/repos/community-staging-x86_64/ tuxpaint/repos/community-staging-x86_64/PKGBUILD (from rev 89419, tuxpaint/trunk/PKGBUILD) tuxpaint/repos/community-staging-x86_64/tuxpaint-0.9.21-libpng1.5.patch (from rev 89419, tuxpaint/trunk/tuxpaint-0.9.21-libpng1.5.patch) ----------------------------------------------------------+ community-staging-i686/PKGBUILD | 53 +++++++++++++ community-staging-i686/tuxpaint-0.9.21-libpng1.5.patch | 19 ++++ community-staging-x86_64/PKGBUILD | 53 +++++++++++++ community-staging-x86_64/tuxpaint-0.9.21-libpng1.5.patch | 19 ++++ 4 files changed, 144 insertions(+) Copied: tuxpaint/repos/community-staging-i686/PKGBUILD (from rev 89419, tuxpaint/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-04-29 11:23:59 UTC (rev 89420) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Sergio Jovani Guzman <moret....@gmail.com> +# Contributor: royrocks <royrock...@gmail.com> + +pkgname=tuxpaint +pkgver=0.9.21 +pkgrel=8 +pkgdesc='Drawing program designed for young children' +arch=('x86_64' 'i686') +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') +makedepends=('setconf') +optdepends=('tuxpaint-stamps: more stamps' + 'tuxpaint-conf: configuration manager') +source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz" + 'tuxpaint-0.9.21-libpng1.5.patch') +sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9' + '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do + sed -i '0,/on/s//on2/' $f + done + + patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch + sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile + setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' + sed -i 's:# fu:fu:' src/tuxpaint.conf + make PREFIX=/usr +} + +package() { + 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" +} + +# vim:set ts=2 sw=2 et: Copied: tuxpaint/repos/community-staging-i686/tuxpaint-0.9.21-libpng1.5.patch (from rev 89419, tuxpaint/trunk/tuxpaint-0.9.21-libpng1.5.patch) =================================================================== --- community-staging-i686/tuxpaint-0.9.21-libpng1.5.patch (rev 0) +++ community-staging-i686/tuxpaint-0.9.21-libpng1.5.patch 2013-04-29 11:23:59 UTC (rev 89420) @@ -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); Copied: tuxpaint/repos/community-staging-x86_64/PKGBUILD (from rev 89419, tuxpaint/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2013-04-29 11:23:59 UTC (rev 89420) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Sergio Jovani Guzman <moret....@gmail.com> +# Contributor: royrocks <royrock...@gmail.com> + +pkgname=tuxpaint +pkgver=0.9.21 +pkgrel=8 +pkgdesc='Drawing program designed for young children' +arch=('x86_64' 'i686') +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') +makedepends=('setconf') +optdepends=('tuxpaint-stamps: more stamps' + 'tuxpaint-conf: configuration manager') +source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz" + 'tuxpaint-0.9.21-libpng1.5.patch') +sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9' + '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do + sed -i '0,/on/s//on2/' $f + done + + patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch + sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile + setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' + sed -i 's:# fu:fu:' src/tuxpaint.conf + make PREFIX=/usr +} + +package() { + 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" +} + +# vim:set ts=2 sw=2 et: Copied: tuxpaint/repos/community-staging-x86_64/tuxpaint-0.9.21-libpng1.5.patch (from rev 89419, tuxpaint/trunk/tuxpaint-0.9.21-libpng1.5.patch) =================================================================== --- community-staging-x86_64/tuxpaint-0.9.21-libpng1.5.patch (rev 0) +++ community-staging-x86_64/tuxpaint-0.9.21-libpng1.5.patch 2013-04-29 11:23:59 UTC (rev 89420) @@ -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);