[arch-commits] Commit in leptonica/trunk (PKGBUILD giflib6.patch)

[Sergej Pupykin]

    Date: Tuesday, May 23, 2017 @ 16:43:31
  Author: spupykin
Revision: 229763

upgpkg: leptonica 1.74.2-1

Modified:
  leptonica/trunk/PKGBUILD
Deleted:
  leptonica/trunk/giflib6.patch

---------------+
 PKGBUILD      |   14 ++-----
 giflib6.patch |  111 --------------------------------------------------------
 2 files changed, 4 insertions(+), 121 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-23 16:41:12 UTC (rev 229762)
+++ PKGBUILD	2017-05-23 16:43:31 UTC (rev 229763)
@@ -3,7 +3,7 @@
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
-pkgver=1.74.1
+pkgver=1.74.2
 pkgrel=1
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64')
@@ -10,18 +10,12 @@
 url="http://www.leptonica.com/"
 license=('custom')
 depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
-	giflib6.patch)
-sha256sums=('746a517a47a3bd2a90bc8d581ca6464c10f30e91a60209735efe45b3778bec62'
-            '5a2e2d3848a61688fde0465102727767d52a3b2489818e6855970f12e0cb9faa')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/DanBloomberg/leptonica/archive/$pkgver.tar.gz")
+sha256sums=('8b2e9bacd23597d0ee21625a7d8443177b1cb85daf196d86b67ad75044e29c27')
 
-prepare() {
-  cd "$srcdir"/leptonica-${pkgver}
-#  patch -p1 <"$srcdir"/giflib6.patch
-}
-
 build() {
   cd "$srcdir"/leptonica-${pkgver}
+  ./autobuild
   ./configure --prefix=/usr
   make
 }

Deleted: giflib6.patch
===================================================================
--- giflib6.patch	2017-05-23 16:41:12 UTC (rev 229762)
+++ giflib6.patch	2017-05-23 16:43:31 UTC (rev 229763)
@@ -1,111 +0,0 @@
-diff -wbBur leptonica-1.70/src/gifio.c leptonica-1.70.my/src/gifio.c
---- leptonica-1.70/src/gifio.c	2013-11-24 01:57:40.000000000 +0400
-+++ leptonica-1.70.my/src/gifio.c	2014-06-09 14:07:31.031928421 +0400
-@@ -121,12 +121,12 @@
- 
-         /* Read all the data, but use only the first image found */
-     if (DGifSlurp(gif) != GIF_OK) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("failed to read GIF data", procName, NULL);
-     }
- 
-     if (gif->SavedImages == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("no images found in GIF", procName, NULL);
-     }
- 
-@@ -134,12 +134,12 @@
-     w = si.ImageDesc.Width;
-     h = si.ImageDesc.Height;
-     if (w <= 0 || h <= 0) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("invalid image dimensions", procName, NULL);
-     }
- 
-     if (si.RasterBits == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("no raster data in GIF", procName, NULL);
-     }
- 
-@@ -151,7 +151,7 @@
-         gif_cmap = gif->SColorMap;
-     } else {
-             /* don't know where to take cmap from */
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         return (PIX *)ERROR_PTR("color map is missing", procName, NULL);
-     }
- 
-@@ -175,7 +175,7 @@
-     }
- 
-     if ((pixd = pixCreate(w, h, d)) == NULL) {
--        DGifCloseFile(gif);
-+        DGifCloseFile(gif, NULL);
-         pixcmapDestroy(&cmap);
-         return (PIX *)ERROR_PTR("failed to allocate pixd", procName, NULL);
-     }
-@@ -207,7 +207,7 @@
-         pixTransferAllData(pixd, &pixdi, 0, 0);
-     }
- 
--    DGifCloseFile(gif);
-+    DGifCloseFile(gif, NULL);
-     return pixd;
- }
- 
-@@ -356,14 +356,14 @@
-         != GIF_OK) {
-         pixDestroy(&pixd);
-         GifFreeMapObject(gif_cmap);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("failed to write screen description", procName, 1);
-     }
-     GifFreeMapObject(gif_cmap); /* not needed after this point */
- 
-     if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("failed to image screen description", procName, 1);
-     }
- 
-@@ -371,13 +371,13 @@
-     wpl = pixGetWpl(pixd);
-     if (d != 1 && d != 2 && d != 4 && d != 8) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("image depth is not in {1, 2, 4, 8}", procName, 1);
-     }
- 
-     if ((gif_line = (GifByteType *)CALLOC(sizeof(GifByteType), w)) == NULL) {
-         pixDestroy(&pixd);
--        EGifCloseFile(gif);
-+        EGifCloseFile(gif, NULL);
-         return ERROR_INT("mem alloc fail for data line", procName, 1);
-     }
- 
-@@ -406,7 +406,7 @@
-         if (EGifPutLine(gif, gif_line, w) != GIF_OK) {
-             FREE(gif_line);
-             pixDestroy(&pixd);
--            EGifCloseFile(gif);
-+            EGifCloseFile(gif, NULL);
-             return ERROR_INT("failed to write data line into GIF", procName, 1);
-         }
-     }
-@@ -422,7 +422,7 @@
- 
-     FREE(gif_line);
-     pixDestroy(&pixd);
--    EGifCloseFile(gif);
-+    EGifCloseFile(gif, NULL);
-     return 0;
- }
-