- Update imlib2 and imlib2_loaders to 1.4.4. This version mainly contains

  bugfixes compared to 1.4.1 with some new functions added.
  I'm also dropping .la files, so port revisions of dependent library
  ports have been bumped accordingly.

4 files changed, 19 insertions, 45 deletions

diff --git a/graphics/imlib2/files/patch-CVE-2008-5187 b/graphics/imlib2/files/patch-CVE-2008-5187
deleted file mode 100644
index 52238dcaf155..000000000000
--- a/graphics/imlib2/files/patch-CVE-2008-5187
+++ /dev/null
@@ -1,14 +0,0 @@
-Obtained from: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505714#15
-
---- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c
-@@ -246,8 +246,8 @@
-                                  return 0;
-                               }
-                             ptr = im->data;
--                            end = ptr + (sizeof(DATA32) * w * h);
-                             pixels = w * h;
-+                            end = ptr + pixels;
-                          }
-                        else
-                          {
diff --git a/graphics/imlib2/files/patch-amd64_blend b/graphics/imlib2/files/patch-amd64_blend
deleted file mode 100644
index 9bfaeab7bc3a..000000000000
--- a/graphics/imlib2/files/patch-amd64_blend
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lib/amd64_blend.S.orig	2010-08-18 09:19:53.000000000 +0000
-+++ src/lib/amd64_blend.S	2010-08-18 09:20:01.000000000 +0000
-@@ -11,6 +11,7 @@
- 
- /*\ Some useful masks \*/
- .data
-+.align 16
- m0X000000: .byte   0,   0,   0,   0,   0,   0, 255,   0
-            .byte   0,   0,   0,   0,   0,   0, 255,   0
- m10000000: .byte   0,   0,   0,   0,   0,   0,   0,   1
---- src/lib/amd64_blend_cmod.S.orig	2010-08-18 09:20:09.000000000 +0000
-+++ src/lib/amd64_blend_cmod.S	2010-08-18 09:20:16.000000000 +0000
-@@ -11,6 +11,7 @@
- 
- /*\ Some useful masks \*/
- .data
-+.align 16
- m0X000000: .byte   0,   0,   0,   0,   0,   0, 255,   0
-            .byte   0,   0,   0,   0,   0,   0, 255,   0
- m10000000: .byte   0,   0,   0,   0,   0,   0,   0,   1
diff --git a/graphics/imlib2/files/patch-loader_png.c b/graphics/imlib2/files/patch-loader_png.c
deleted file mode 100644
index ce76ad89d42e..000000000000
--- a/graphics/imlib2/files/patch-loader_png.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/loaders/loader_png.c.orig	2007-08-25 04:33:10.000000000 +0200
-+++ src/modules/loaders/loader_png.c	2010-03-28 16:18:53.000000000 +0200
-@@ -38,7 +38,7 @@
- 
-         /* if we haven't read the header before, set the header data */
-         fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--        if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+        if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-           {
-              fclose(f);
-              return 0;
diff --git a/graphics/imlib2/files/patch-src_lib_common.h b/graphics/imlib2/files/patch-src_lib_common.h
new file mode 100644
index 000000000000..247214ca492e
--- /dev/null
+++ b/graphics/imlib2/files/patch-src_lib_common.h
@@ -0,0 +1,19 @@
+--- 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