summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-10 23:52:41 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-10 23:52:41 +0000
commit63e43a9118dbf30d207d3c1315f7b0089a0a76b5 (patch)
tree5bdeb6fd6486206d7d7e9757357a4c9a7615dcb1 /media-libs/libwmf/files
parentEnsure kernel checks only occur when USE=module. FIxes bug 268378. (diff)
downloadgentoo-2-63e43a9118dbf30d207d3c1315f7b0089a0a76b5.tar.gz
gentoo-2-63e43a9118dbf30d207d3c1315f7b0089a0a76b5.tar.bz2
gentoo-2-63e43a9118dbf30d207d3c1315f7b0089a0a76b5.zip
Drop use of internal gd w.r.t. bug 268161. Add fix for bug 269324, include order bug, possibly triggered by gcc-4.4.0.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libwmf/files')
-rw-r--r--media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch
new file mode 100644
index 000000000000..52717735a26e
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch
@@ -0,0 +1,20 @@
+diff -NrU5 libwmf-0.2.8.4.orig/src/ipa/ipa.c libwmf-0.2.8.4/src/ipa/ipa.c
+--- libwmf-0.2.8.4.orig/src/ipa/ipa.c 2009-05-10 23:41:17.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa.c 2009-05-11 00:07:43.000000000 +0200
+@@ -33,10 +33,16 @@
+
+ /* Define WMF_API if this is module so that ipa headers are included via "wmfdefs.h" first
+ */
+ #define WMF_IPA 1
+
++#ifndef HAVE_GD
++#ifdef HAVE_LIBPNG
++#include <png.h>
++#endif /* HAVE_LIBPNG */
++#endif /* HAVE_GD */
++
+ #include "wmfdefs.h"
+
+ #include "ipa/ipa.h"
+ #include "ipa/ipa/bmp.h" /* Provides default bitmap functionality */
+