Support libp2edrvswf (and media-libs/ming) again wrt #238803 by Martin Mokrejš.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 29 insertions, 48 deletions

diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch b/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch
deleted file mode 100644
index bc4909abc2c8..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/175679
-
-diff --git a/config/pstoedit.m4 b/config/pstoedit.m4
-index b6fa407..67b923b 100644
---- a/config/pstoedit.m4
-+++ b/config/pstoedit.m4
-@@ -5,6 +5,11 @@ dnl AM_PATH_PSTOEDIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]
- dnl Test to see if libpstoedit is installed, and define PSTOEDIT_CFLAGS, LIBS
- dnl
- 
-+AC_DEFUN([AM_PATH_PSTOEDIT],
-+[dnl
-+dnl Get the cflags and libraries from the pstoedit-config script
-+dnl
-+
- AC_ARG_WITH(pstoedit-prefix,[  --with-pstoedit-prefix=PFX   Prefix where Pstoedit is installed (optional)],
-             pstoedit_prefix="$withval", pstoedit_prefix="")
- AC_ARG_WITH(pstoedit-exec-prefix,[  --with-pstoedit-exec-prefix=PFX Exec prefix where Pstoedit is installed (optional)],
diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch b/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch
deleted file mode 100644
index 3bec05e69e6e..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cppcomp.h
-+++ src/cppcomp.h
-@@ -122,6 +122,8 @@
- #define I_iomanip		<iomanip>
- #define I_ios			<ios>
- #define I_iostream		<iostream>
-+#include <cstdlib>
-+#include <cstring>
- 
- #if (defined (_MSC_VER) && _MSC_VER >= 1100)
- // 1100 is version 5.0
diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch b/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch
deleted file mode 100644
index 9a41271fbaa4..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dynload.cpp	2009-04-05 21:52:11.000000000 -0400
-+++ src/dynload.cpp	2009-04-05 21:53:09.000000000 -0400
-@@ -138,7 +138,7 @@
- 		dlclose(handle);
- #elif defined(_WIN32)
- 		(void) WINFREELIB((HINSTANCE) handle);
--#elif
-+#else
- #error "system unsupported so far"
- #endif
- 		handle = 0;
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
index 4f1f73b04528..480efd7250c9 100644
--- a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
@@ -1,7 +1,5 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+--- src/Makefile.am
++++ src/Makefile.am
 @@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
          $(sample_drivers_src)                   
  libp2edrvstd_la_LIBADD=-L. libpstoedit.la
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
index 6787d6aefd4a..df2aa7c47d05 100644
--- a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
@@ -1,9 +1,7 @@
 http://bugzilla.redhat.com/507035
 
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
+--- src/dynload.cpp
++++ src/dynload.cpp
 @@ -147,7 +147,6 @@ void DynLoader::close()
  
  DynLoader::~DynLoader()
diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch
new file mode 100644
index 000000000000..36500935ec11
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/238803
+
+--- configure.ac
++++ configure.ac
+@@ -181,7 +181,7 @@
+ 	[LIBMING_CFLAGS="-DHAVE_LIBMING"])
+ if test -n "${LIBMING_LDFLAGS}" && test -n "${LIBMING_CFLAGS}"; then
+    HAVE_LIBMING=yes
+-   AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL"])
++   AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL -DUSE_PNG"])
+ else
+    LIBMING_LDFLAGS=
+    LIBMING_CFLAGS=
+--- src/drvswf.cpp
++++ src/drvswf.cpp
+@@ -31,8 +31,7 @@
+ //static bool trace = false;
+ //static bool cubic = false;
+ 
+-#include "mingpp.h"
+-#include "ming_config.h"
++#include <mingpp.h>
+ 
+ #if defined(_WIN32)
+ extern "C" {