main/imlib2: upgrade to 1.4.7

3 files changed, 5 insertions, 88 deletions

diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 0e10d0bae..599d6cb48 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imlib2
-pkgver=1.4.6
-pkgrel=3
+pkgver=1.4.7
+pkgrel=0
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch="all"
@@ -12,8 +12,6 @@ depends_dev="freetype-dev libxext-dev libsm-dev"
 makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev
 	libpng-dev libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev"
 source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
-	imlib2-giflib5.patch
-	remove-my_libs.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -47,12 +45,6 @@ package() {
 		"$pkgdir"/usr/lib/imlib2/*/*.la || return 1
 	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="5c7104121ec6db652b37f74a6d7048e2  imlib2-1.4.6.tar.bz2
-c34a57b7d8526ee17ebfc4b472867930  imlib2-giflib5.patch
-2f12454f23a8d8a867577f6bee5c29df  remove-my_libs.patch"
-sha256sums="af51be727d62cfcff7457c753f355e44848fb997f33a7e1d43775276a9073274  imlib2-1.4.6.tar.bz2
-2dd0f75ac2a45fc0cf435951e69093a7ed56aa29bdc5603c434f40c3340210ce  imlib2-giflib5.patch
-5117e9a7f9d1ea44ef468fa4d13baf80c46c60ad07abb4d4900bc2c256a00906  remove-my_libs.patch"
-sha512sums="50d9f16eb09029c127c2ea904d59c46dceefabec7cf2aeb05a6cec7bfd9886f01fee863958c209cbdb7fe7991e0b6a883e5d910c9c2bf2991038719aa8687787  imlib2-1.4.6.tar.bz2
-e7742900e45c13af2a9947866b69c404350d0e545a9924a39b0b58eb8527ce8194f43989f2de3cb0bf4e5e82f3d22ce8a6e88aedea6e6acf21d3206f20111e54  imlib2-giflib5.patch
-e4fdc734f00f9b85c84517802502c482c78132f2badc800cb8c08c851c7535556ded0c011515f669599ee6b8aa10096c58cd5cf64257f341b5c943dd1e07448e  remove-my_libs.patch"
+md5sums="f2f1418c376da6125453f90f2d58d938  imlib2-1.4.7.tar.bz2"
+sha256sums="35d733ce23ad7d338cff009095d37e656cb8a7a53717d53793a38320f9924701  imlib2-1.4.7.tar.bz2"
+sha512sums="3954d6426efbe2fcfb755c74a0ea7c1c61e65c5dc3cbdcea88c9e5de6294de69439ac05c724d83f4703f121d70f6af2f860e2aa423296c30ef99f4bdd2e60db8  imlib2-1.4.7.tar.bz2"
diff --git a/main/imlib2/imlib2-giflib5.patch b/main/imlib2/imlib2-giflib5.patch
deleted file mode 100644
index 1bd8627d3..000000000
--- a/main/imlib2/imlib2-giflib5.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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]);
diff --git a/main/imlib2/remove-my_libs.patch b/main/imlib2/remove-my_libs.patch
deleted file mode 100644
index 1d4dc93be..000000000
--- a/main/imlib2/remove-my_libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./imlib2-config.in.orig
-+++ ./imlib2-config.in
-@@ -46,7 +46,7 @@
-       ;;
-     --libs)
-       libdirs=-L@libdir@
--      echo $libdirs -lImlib2 @my_libs@
-+      echo $libdirs -lImlib2
-       ;;
-     *)
-       echo "${usage}" 1>&2