[arch-commits] Commit in sxiv/trunk (PKGBUILD giflib-5.1.0.patch)

[Bartłomiej Piotrowski]

    Date: Tuesday, May 27, 2014 @ 11:44:26
  Author: bpiotrowski
Revision: 111957

upgpkg: sxiv 1.2-2

rebuild against giflib 5.1.0

Added:
  sxiv/trunk/giflib-5.1.0.patch
Modified:
  sxiv/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   17 ++++++++++++-----
 giflib-5.1.0.patch |   15 +++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-27 09:30:36 UTC (rev 111956)
+++ PKGBUILD	2014-05-27 09:44:26 UTC (rev 111957)
@@ -6,7 +6,7 @@
 
 pkgname=sxiv
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Simple X Image Viewer'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -13,15 +13,22 @@
 install=sxiv.install
 url='https://github.com/muennich/sxiv'
 depends=('imlib2' 'desktop-file-utils')
-source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz)
-md5sums=('9b79d3c70693d9abbc66295cf6f281a0')
+source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz
+        giflib-5.1.0.patch)
+md5sums=('9b79d3c70693d9abbc66295cf6f281a0'
+         '98a6c832655b90e57ff137df41a1fb90')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../giflib-5.1.0.patch
+}
+
 build() {
-  make -C sxiv-$pkgver
+  make -C $pkgname-$pkgver
 }
 
 package() {
-  cd sxiv-$pkgver
+  cd $pkgname-$pkgver
   make PREFIX="$pkgdir"/usr install
   install -Dm644 sxiv.desktop "$pkgdir"/usr/share/applications/sxiv.desktop
 }

Added: giflib-5.1.0.patch
===================================================================
--- giflib-5.1.0.patch	                        (rev 0)
+++ giflib-5.1.0.patch	2014-05-27 09:44:26 UTC (rev 111957)
@@ -0,0 +1,15 @@
+diff -rupN a/image.c b/image.c
+--- a/image.c	2014-04-24 20:40:26.000000000 +0200
++++ b/image.c	2014-05-27 11:39:41.786715632 +0200
+@@ -278,7 +278,11 @@ bool img_load_gif(img_t *img, const file
+ 		}
+ 	} while (rec != TERMINATE_RECORD_TYPE);
+ 
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++	DGifCloseFile(gif, NULL);
++#else
+ 	DGifCloseFile(gif);
++#endif
+ 
+ 	if (err && !file->loaded)
+ 		warn("corrupted gif file: %s", file->name);