From 6459b84bf754eda5323f40eb7af76dde65b63251 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Tue, 17 Jun 2014 03:27:11 +0000
Subject: Tue Jun 17 03:23:47 UTC 2014

---
 community/mtpaint/PKGBUILD     | 17 ++++++++++-------
 community/mtpaint/giflib.patch | 29 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 community/mtpaint/giflib.patch

(limited to 'community/mtpaint')

diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index c8e766304..43f3dd79a 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96840 2013-09-06 11:15:47Z arodseth $
+# $Id: PKGBUILD 113166 2014-06-14 19:22:20Z andyrtr $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
 
 pkgname=mtpaint
 pkgver=3.40
-pkgrel=13
+pkgrel=14
 pkgdesc='Simple paint program for creating icons and pixel based artwork'
 arch=('x86_64' 'i686')
 url='http://mtpaint.sourceforge.net/'
@@ -15,12 +15,17 @@ depends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2'
 makedepends=('gtk2' 'giflib' 'libjpeg' 'openjpeg' 'lcms2' 'libtiff' 'libpng'
              'freetype2')
 install='mtpaint.install'
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'giflib.patch')
+sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
+            '38b3a50d7275e9dc3fe8c78e774b51fa55fc7bf11a490c13b4974455c7db830c')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
+  # GIFLIB patch for the file close function
+  patch -p0 -i "$srcdir/giflib.patch"
+
   # Recommended by Mark Tyler himself
   sed -i 's:$LIBS $LDFLAGS:$LDFLAGS $LIBS:' configure
 
@@ -40,9 +45,7 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/mtpaint/giflib.patch b/community/mtpaint/giflib.patch
new file mode 100644
index 000000000..24c4403c7
--- /dev/null
+++ b/community/mtpaint/giflib.patch
@@ -0,0 +1,29 @@
+--- src/png.c	2014-05-28 12:02:50.000000000 +0200
++++ src2/png.c	2014-05-28 12:02:43.569815883 +0200
+@@ -1608,7 +1608,7 @@
+ 	}
+ 	res = 1;
+ fail:	mem_free_chanlist(w_set.img);
+-	DGifCloseFile(giffy);
++	DGifCloseFile(giffy, NULL);
+ 	return (res);
+ }
+ 
+@@ -1659,7 +1659,7 @@
+ 		}
+ 	}
+ 	res = 1;
+-fail:	DGifCloseFile(giffy);
++fail:	DGifCloseFile(giffy, NULL);
+ 	return (res);
+ }
+ 
+@@ -1725,7 +1725,7 @@
+ 	if (!settings->silent) progress_end();
+ 	msg = 0;
+ 
+-fail:	EGifCloseFile(giffy);
++fail:	EGifCloseFile(giffy, NULL);
+ #ifndef WIN32
+ 	/* giflib creates files with 0600 permissions, which is nasty - WJ */
+ 	mode = umask(0022);
-- 
cgit v1.2.3-54-g00ecf