graphics/imlib2: Update to 1.4.7

This update includes fixes for potential security issues. No CVEs have
been assigned yet.

https://git.enlightenment.org/legacy/imlib2.git/tree/ChangeLog

MFH:		2016Q1

6 files changed, 4 insertions, 119 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 3767f4d..00783fe 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	imlib2
-PORTVERSION=	1.4.6
-PORTREVISION=	7
+PORTVERSION=	1.4.7
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 837fddf..7b4f15e 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (imlib2-1.4.6.tar.bz2) = af51be727d62cfcff7457c753f355e44848fb997f33a7e1d43775276a9073274
-SIZE (imlib2-1.4.6.tar.bz2) = 872717
+SHA256 (imlib2-1.4.7.tar.bz2) = 35d733ce23ad7d338cff009095d37e656cb8a7a53717d53793a38320f9924701
+SIZE (imlib2-1.4.7.tar.bz2) = 889510
diff --git a/graphics/imlib2/files/patch-imlib2-config.in b/graphics/imlib2/files/patch-imlib2-config.in
deleted file mode 100644
index 183d72c..0000000
--- a/graphics/imlib2/files/patch-imlib2-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- imlib2-config.in.orig	2014-02-06 19:05:15.000000000 -0500
-+++ imlib2-config.in	2014-02-06 19:05:35.000000000 -0500
-@@ -46,7 +46,7 @@
-       ;;
-     --libs)
-       libdirs=-L@libdir@
--      echo $libdirs -lImlib2 @my_libs@
-+      echo $libdirs -lImlib2
-       ;;
-     *)
-       echo "${usage}" 1>&2
diff --git a/graphics/imlib2/files/patch-src_lib_common.h b/graphics/imlib2/files/patch-src_lib_common.h
deleted file mode 100644
index 247214c..0000000
--- a/graphics/imlib2/files/patch-src_lib_common.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/common.h.orig	2010-12-14 19:39:16.000000000 -0800
-+++ src/lib/common.h	2010-12-14 19:39:34.000000000 -0800
-@@ -16,10 +16,12 @@
- #include <sys/types.h>
- #endif
- 
--#if defined(__GNUC__) && (__GNUC__ >= 4)
--#define __hidden __attribute__((visibility("hidden")))
--#else
--#define __hidden
-+#ifndef __hidden
-+# if defined(__GNUC__) && (__GNUC__ >= 4)
-+#  define __hidden __attribute__((visibility("hidden")))
-+# else
-+#  define __hidden
-+# endif
- #endif
- 
- #define DATABIG unsigned long long
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c b/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
deleted file mode 100644
index 972d195..0000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/modules/loaders/loader_gif.c.orig	2013-12-21 10:16:10 UTC
-+++ src/modules/loaders/loader_gif.c
-@@ -36,7 +36,11 @@ load(ImlibImage * im, ImlibProgressFunct
- #endif
-    if (fd < 0)
-       return 0;
-+#if GIFLIB_MAJOR >= 5
-+   gif = DGifOpenFileHandle(fd, NULL);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         close(fd);
-@@ -60,13 +64,21 @@ load(ImlibImage * im, ImlibProgressFunct
-              h = gif->Image.Height;
-              if (!IMAGE_DIMENSIONS_OK(w, h))
-                {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+                  DGifCloseFile(gif, NULL);
-+#else
-                   DGifCloseFile(gif);
-+#endif
-                   return 0;
-                }
-              rows = malloc(h * sizeof(GifRowType *));
-              if (!rows)
-                {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+                  DGifCloseFile(gif, NULL);
-+#else
-                   DGifCloseFile(gif);
-+#endif
-                   return 0;
-                }
-              for (i = 0; i < h; i++)
-@@ -78,7 +90,11 @@ load(ImlibImage * im, ImlibProgressFunct
-                   rows[i] = malloc(w * sizeof(GifPixelType));
-                   if (!rows[i])
-                     {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+                       DGifCloseFile(gif, NULL);
-+#else
-                        DGifCloseFile(gif);
-+#endif
-                        for (i = 0; i < h; i++)
-                          {
-                             if (rows[i])
-@@ -150,7 +166,11 @@ load(ImlibImage * im, ImlibProgressFunct
-         im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
-         if (!im->data)
-           {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+             DGifCloseFile(gif, NULL);
-+#else
-              DGifCloseFile(gif);
-+#endif
-              free(rows);
-              return 0;
-           }
-@@ -181,7 +201,11 @@ load(ImlibImage * im, ImlibProgressFunct
-                        last_per = (int)per;
-                        if (!(progress(im, (int)per, 0, last_y, w, i)))
-                          {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+                            DGifCloseFile(gif, NULL);
-+#else
-                             DGifCloseFile(gif);
-+#endif
-                             for (i = 0; i < h; i++)
-                               {
-                                  free(rows[i]);
-@@ -198,7 +222,11 @@ load(ImlibImage * im, ImlibProgressFunct
-      {
-         progress(im, 100, 0, last_y, w, h);
-      }
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+   DGifCloseFile(gif, NULL);
-+#else
-    DGifCloseFile(gif);
-+#endif
-    for (i = 0; i < h; i++)
-      {
-         free(rows[i]);
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index bf53525..c4b9af3 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -26,7 +26,7 @@ lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.so
 lib/libImlib2.so
 lib/libImlib2.so.1
-lib/libImlib2.so.1.4.6
+lib/libImlib2.so.1.4.7
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf