[arch-commits] Commit in imlib2/trunk (3 files)

[Jan de Groot]

    Date: Tuesday, May 27, 2014 @ 12:01:09
  Author: jgc
Revision: 213648

upgpkg: imlib2 1.4.6-2

giflib rebuild

Added:
  imlib2/trunk/imlib2-giflib51.patch
Modified:
  imlib2/trunk/PKGBUILD
Deleted:
  imlib2/trunk/imlib2-giflib5.patch

-----------------------+
 PKGBUILD              |    8 +++---
 imlib2-giflib5.patch  |   14 ----------
 imlib2-giflib51.patch |   64 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-27 09:50:39 UTC (rev 213647)
+++ PKGBUILD	2014-05-27 10:01:09 UTC (rev 213648)
@@ -5,7 +5,7 @@
 
 pkgname=imlib2
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
@@ -12,13 +12,13 @@
 license=('BSD')
 depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
-        imlib2-giflib5.patch)
+        imlib2-giflib51.patch)
 sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
-          '29d0778ffbe6e57f08048918a79eb1ad6af87bce')
+          '3ee249142b4caecc4a38ac29a999708447f250c1')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np0 -i ../imlib2-giflib5.patch
+  patch -Np1 -i ../imlib2-giflib51.patch
 }
 
 build() {

Deleted: imlib2-giflib5.patch
===================================================================
--- imlib2-giflib5.patch	2014-05-27 09:50:39 UTC (rev 213647)
+++ imlib2-giflib5.patch	2014-05-27 10:01:09 UTC (rev 213648)
@@ -1,14 +0,0 @@
---- src/modules/loaders/loader_gif.c.orig
-+++ src/modules/loaders/loader_gif.c
-@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct
- #endif
-    if (fd < 0)
-       return 0;
-+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
-+   gif = DGifOpenFileHandle(fd, NULL);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         close(fd);

Added: imlib2-giflib51.patch
===================================================================
--- imlib2-giflib51.patch	                        (rev 0)
+++ imlib2-giflib51.patch	2014-05-27 10:01:09 UTC (rev 213648)
@@ -0,0 +1,64 @@
+diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c
+--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c	2013-12-21 10:16:10.000000000 +0000
++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c	2014-05-27 09:52:35.857291512 +0000
+@@ -36,7 +36,7 @@
+ #endif
+    if (fd < 0)
+       return 0;
+-   gif = DGifOpenFileHandle(fd);
++   gif = DGifOpenFileHandle(fd, NULL);
+    if (!gif)
+      {
+         close(fd);
+@@ -60,13 +60,13 @@
+              h = gif->Image.Height;
+              if (!IMAGE_DIMENSIONS_OK(w, h))
+                {
+-                  DGifCloseFile(gif);
++                  DGifCloseFile(gif, NULL);
+                   return 0;
+                }
+              rows = malloc(h * sizeof(GifRowType *));
+              if (!rows)
+                {
+-                  DGifCloseFile(gif);
++                  DGifCloseFile(gif, NULL);
+                   return 0;
+                }
+              for (i = 0; i < h; i++)
+@@ -78,7 +78,7 @@
+                   rows[i] = malloc(w * sizeof(GifPixelType));
+                   if (!rows[i])
+                     {
+-                       DGifCloseFile(gif);
++                       DGifCloseFile(gif, NULL);
+                        for (i = 0; i < h; i++)
+                          {
+                             if (rows[i])
+@@ -150,7 +150,7 @@
+         im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
+         if (!im->data)
+           {
+-             DGifCloseFile(gif);
++             DGifCloseFile(gif, NULL);
+              free(rows);
+              return 0;
+           }
+@@ -181,7 +181,7 @@
+                        last_per = (int)per;
+                        if (!(progress(im, (int)per, 0, last_y, w, i)))
+                          {
+-                            DGifCloseFile(gif);
++                            DGifCloseFile(gif, NULL);
+                             for (i = 0; i < h; i++)
+                               {
+                                  free(rows[i]);
+@@ -198,7 +198,7 @@
+      {
+         progress(im, 100, 0, last_y, w, h);
+      }
+-   DGifCloseFile(gif);
++   DGifCloseFile(gif, NULL);
+    for (i = 0; i < h; i++)
+      {
+         free(rows[i]);