graphics-libs/libwmf/: 2006/06/15 sync stable from p4

7 files changed, 57 insertions, 1 deletions

diff --git a/graphics-libs/libwmf/BUILD b/graphics-libs/libwmf/BUILD
new file mode 100755
index 0000000000..efb82e2e87
--- /dev/null
+++ b/graphics-libs/libwmf/BUILD
@@ -0,0 +1,4 @@
+if  [ $XML_SUPPORT = 'n' ]; then
+	OPTS="$OPTS --without-libxml2 --without-expat"
+fi  &&
+default_build
diff --git a/graphics-libs/libwmf/CONFIGURE b/graphics-libs/libwmf/CONFIGURE
new file mode 100755
index 0000000000..83238ae460
--- /dev/null
+++ b/graphics-libs/libwmf/CONFIGURE
@@ -0,0 +1,9 @@
+config_query 		XML_SUPPORT                                              \
+			"Do you want XML support?" y                             &&
+
+if [ $XML_SUPPORT = 'y' ]; then
+  config_query_list  	XML_PROVIDER                                             \
+			"Which spell do you want to use to provide XML support?" \
+			"expat"                                                  \
+			"libxml2"
+fi
diff --git a/graphics-libs/libwmf/DEPENDS b/graphics-libs/libwmf/DEPENDS
new file mode 100755
index 0000000000..5e70a6732a
--- /dev/null
+++ b/graphics-libs/libwmf/DEPENDS
@@ -0,0 +1,15 @@
+depends freetype2  && 
+depends libpng     &&
+depends jpeg       &&
+
+optional_depends gd "--disable-gd" "--enable-gd" "For GD support"  &&
+optional_depends X11-SERVER "--with-x" "--without-x" "For X support"  &&
+optional_depends gtk+2 "--with-x" "--without-x" "For a gdk-pixbuf plugin"  &&
+
+if  [ $XML_SUPPORT = 'y' ]; then
+	if [ $XML_PROVIDER = "libxml2" ]; then
+		depends libxml2 "--without-expat"
+	else
+		depends expat   "--without-libxml2"
+	fi
+fi
diff --git a/graphics-libs/libwmf/DETAILS b/graphics-libs/libwmf/DETAILS
index a8c0e6493d..965f5a0e55 100755
--- a/graphics-libs/libwmf/DETAILS
+++ b/graphics-libs/libwmf/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          UPDATED=20020509
           MD5[0]=42582d27bb5cb73d36e1d39e6d25c362
 	LICENSE[0]=GPL
-	MAINTAINER=unet@sourcemage.org
            SHORT="libwmf is a library for reading wmf vector images"
 cat << EOF
 libwmf is a library for reading vector images in Microsøft's native Windøws
diff --git a/graphics-libs/libwmf/HISTORY b/graphics-libs/libwmf/HISTORY
index e168c9ffd9..f01e66da0d 100644
--- a/graphics-libs/libwmf/HISTORY
+++ b/graphics-libs/libwmf/HISTORY
@@ -1,3 +1,14 @@
+2006-06-10 Flavien Bridault <vlaaad@sourcemage.org>
+	* libpng.patch: fix bug #12037, thanks Arwed :-)
+	* PRE_BUILD: added, apply patch
+	* DEPENDS: corrected enabling/disabling of internal libgd
+
+2006-04-25 Flavien Bridault <vlaaad@sourcemage.org>
+	* DEPENDS: added, all dependencies were missing (bug #11472)
+	* CONFIGURE: added to prompt about XML support
+	* BUILD: added to be able to disable XML support
+	* DETAILS: removed obsolete MAINTAINER
+
 2004-05-08 Treeve Jelbert <treeve01@pi.be?>
 	* DETAILS: version 0.2.8.3
 
diff --git a/graphics-libs/libwmf/PRE_BUILD b/graphics-libs/libwmf/PRE_BUILD
new file mode 100755
index 0000000000..0008b1e6d5
--- /dev/null
+++ b/graphics-libs/libwmf/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd  $SOURCE_DIRECTORY  &&
+patch -p0 < $SCRIPT_DIRECTORY/png_header_fix.patch
diff --git a/graphics-libs/libwmf/png_header_fix.patch b/graphics-libs/libwmf/png_header_fix.patch
new file mode 100644
index 0000000000..c4bdfe514c
--- /dev/null
+++ b/graphics-libs/libwmf/png_header_fix.patch
@@ -0,0 +1,15 @@
+--- src/ipa/ipa.c~	2006-06-10 16:54:43.000000000 +0200
++++ src/ipa/ipa.c	2006-06-10 16:54:46.000000000 +0200
+@@ -31,6 +31,12 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef HAVE_GD
++#ifdef HAVE_LIBPNG
++#include <png.h>
++#endif
++#endif
++
+ /* Define WMF_API if this is module so that ipa headers are included via "wmfdefs.h" first
+  */
+ #define WMF_IPA 1