From c270fd5b2cd42b593708a919254fbbb609bbf641 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 4 Sep 2013 02:15:19 -0700 Subject: Wed Sep 4 02:13:41 PDT 2013 --- community/mtpaint/PKGBUILD | 31 +++++++++++++------------------ community/mtpaint/libpng15.patch | 21 --------------------- 2 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 community/mtpaint/libpng15.patch (limited to 'community/mtpaint') diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index c2f31b445..cee1881d0 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 96473 2013-08-30 11:19:31Z arodseth $ +# $Id: PKGBUILD 96739 2013-09-03 19:46:20Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Roman Kyrylych # Contributor: yosh64 pkgname=mtpaint pkgver=3.40 -pkgrel=10 +pkgrel=12 pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('x86_64' 'i686') url='http://mtpaint.sourceforge.net/' license=('GPL3') -depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2' 'jasper') -makedepends=('gtk2' 'giflib' 'openjpeg' 'lcms2' 'setconf' 'jasper') +depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2' + 'jasper' 'libtiff' 'libpng' 'freetype2') +makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'jasper' 'libtiff' + 'libpng' 'freetype2') install='mtpaint.install' -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" - 'libpng15.patch') -sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' - 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") +sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - patch -Np1 -i '../libpng15.patch' - sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c @@ -30,18 +28,15 @@ prepare() { } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS" - ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff - sed -i 's:-lpng:-lpng -lgif:' _conf.txt - sed -i 's:ungif:gif:g' _conf.txt - setconf _conf.txt CC 'gcc -w' + export CFLAGS="-w `pkg-config libopenjpeg --cflags` $CFLAGS" + ./configure --prefix=/usr --mandir=/usr/share/man man intl GIF jpeg tiff cflags lcms2 jp2 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/mtpaint/libpng15.patch b/community/mtpaint/libpng15.patch deleted file mode 100644 index 7df3b2127..000000000 --- a/community/mtpaint/libpng15.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c ---- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200 -+++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200 -@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_ - if (settings->bpp == 3) - { - png_set_strip_16(png_ptr); -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_set_palette_to_rgb(png_ptr); - png_set_gray_to_rgb(png_ptr); - -@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_ - png_set_strip_alpha(png_ptr); - png_set_packing(png_ptr); - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - for (i = 0; i < height; i++) - { - row_pointers[i] = settings->img[CHN_IMAGE] + i * width; -- cgit v1.2.3-54-g00ecf