[arch-commits] Commit in metapixel/trunk (2 files)

[Lukas Fleischer]

    Date: Wednesday, May 28, 2014 @ 20:43:39
  Author: lfleischer
Revision: 112026

upgpkg: metapixel 1.0.2-7

giflib rebuild.

Added:
  metapixel/trunk/metapixel-giflib-5.1.0-compat.patch
Modified:
  metapixel/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   17 +++++++++++++----
 metapixel-giflib-5.1.0-compat.patch |   23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-28 18:14:20 UTC (rev 112025)
+++ PKGBUILD	2014-05-28 18:43:39 UTC (rev 112026)
@@ -4,7 +4,7 @@
 
 pkgname=metapixel
 pkgver=1.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc='A program for generating photomosaics.'
 arch=('i686' 'x86_64')
 url='http://www.complang.tuwien.ac.at/schani/metapixel/'
@@ -11,15 +11,24 @@
 license=('GPL')
 depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
 makedepends=('git' 'docbook-xsl')
-source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82")
-md5sums=('SKIP')
+source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
+        "metapixel-giflib-5.1.0-compat.patch")
+md5sums=('SKIP'
+         'b959c6d1b14064aee3a73ae568a82555')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}"
 
   git submodule init
   git submodule update
 
+  cd rwimg
+  patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
   # Build librwimg first, make dependencies seem to be bugged.
   make librwimg
   make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl"

Added: metapixel-giflib-5.1.0-compat.patch
===================================================================
--- metapixel-giflib-5.1.0-compat.patch	                        (rev 0)
+++ metapixel-giflib-5.1.0-compat.patch	2014-05-28 18:43:39 UTC (rev 112026)
@@ -0,0 +1,23 @@
+diff --git a/rwgif.c b/rwgif.c
+index e67ac3c..6b19a28 100644
+--- a/rwgif.c
++++ b/rwgif.c
+@@ -54,8 +54,7 @@ open_gif_file (const char *filename, int *width, int *height)
+     
+     assert(data != 0);
+     
+-    int error;
+-    data->file = DGifOpenFileName(filename, &error);
++    data->file = DGifOpenFileName(filename, NULL);
+     
+     assert(data->file !=0);
+         
+@@ -138,7 +137,7 @@ open_gif_file (const char *filename, int *width, int *height)
+     }
+     free(buffer);
+     
+-    assert(DGifCloseFile(data->file) == GIF_OK);
++    assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+     
+     return data;
+ }