Fri Aug 2 01:30:56 PDT 2013

2 files changed, 67 insertions, 4 deletions

diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index 366c8dc40..19b4fa212 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 90052 2013-05-06 19:38:03Z foutrelis $
+# $Id: PKGBUILD 94927 2013-08-01 07:01:21Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.69
-pkgrel=7
+pkgrel=8
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64')
 url="http://www.leptonica.com/"
 license=('custom')
 options=(!libtool)
 depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
-md5sums=('d4085c302cbcab7f9af9d3d6f004ab22')
+source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
+	giflib6.patch)
+md5sums=('d4085c302cbcab7f9af9d3d6f004ab22'
+         'f87e1b2c98107fe51544d4f4c44a9733')
+
+prepare() {
+  cd ${srcdir}/leptonica-${pkgver}
+  patch -p1 <$srcdir/giflib6.patch
+}
 
 build() {
   cd ${srcdir}/leptonica-${pkgver}
diff --git a/community/leptonica/giflib6.patch b/community/leptonica/giflib6.patch
new file mode 100644
index 000000000..10dc02eee
--- /dev/null
+++ b/community/leptonica/giflib6.patch
@@ -0,0 +1,56 @@
+diff -wbBur leptonica-1.69/src/gifio.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c
+--- leptonica-1.69/src/gifio.c	2012-01-22 22:29:15.000000000 +0400
++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c	2013-07-30 18:27:19.269137200 +0400
+@@ -100,7 +100,7 @@
+     _lseek(fd, 0, SEEK_SET);
+ #endif  /* _MSC_VER */
+ 
+-    if ((gif = DGifOpenFileHandle(fd)) == NULL)
++    if ((gif = DGifOpenFileHandle(fd, NULL)) == NULL)
+         return (PIX *)ERROR_PTR("invalid file or file not found",
+                                 procName, NULL);
+ 
+@@ -316,7 +316,7 @@
+     }
+ 
+         /* Save the cmap colors in a gif_cmap */
+-    if ((gif_cmap = MakeMapObject(gif_ncolor, NULL)) == NULL) {
++    if ((gif_cmap = GifMakeMapObject(gif_ncolor, NULL)) == NULL) {
+         pixDestroy(&pixd);
+         return ERROR_INT("failed to create GIF color map", procName, 1);
+     }
+@@ -325,7 +325,7 @@
+         if (ncolor > 0) {
+             if (pixcmapGetColor(cmap, i, &rval, &gval, &bval) != 0) {
+                 pixDestroy(&pixd);
+-                FreeMapObject(gif_cmap);
++                GifFreeMapObject(gif_cmap);
+                 return ERROR_INT("failed to get color from color map",
+                                  procName, 1);
+             }
+@@ -337,9 +337,9 @@
+     }
+ 
+         /* Get the gif file handle */
+-    if ((gif = EGifOpenFileHandle(fd)) == NULL) {
++    if ((gif = EGifOpenFileHandle(fd, NULL)) == NULL) {
+         pixDestroy(&pixd);
+-        FreeMapObject(gif_cmap);
++        GifFreeMapObject(gif_cmap);
+         return ERROR_INT("failed to create GIF image handle", procName, 1);
+     }
+ 
+@@ -347,11 +347,11 @@
+     if (EGifPutScreenDesc(gif, w, h, gif_cmap->BitsPerPixel, 0, gif_cmap)
+         != GIF_OK) {
+         pixDestroy(&pixd);
+-        FreeMapObject(gif_cmap);
++        GifFreeMapObject(gif_cmap);
+         EGifCloseFile(gif);
+         return ERROR_INT("failed to write screen description", procName, 1);
+     }
+-    FreeMapObject(gif_cmap); /* not needed after this point */
++    GifFreeMapObject(gif_cmap); /* not needed after this point */
+ 
+     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
+         pixDestroy(&pixd);