5 files changed, 27 insertions, 25 deletions

diff --git a/graphics/gnash/files/patch-configure b/graphics/gnash/files/patch-configure
index 6c829e306f84..e9283fec0511 100644
--- a/graphics/gnash/files/patch-configure
+++ b/graphics/gnash/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-06-24 09:37:48.372797223 +0200
-+++ configure	2011-06-24 09:49:48.244082692 +0200
-@@ -20791,9 +20791,9 @@
+--- configure.orig	2011-03-18 09:50:30.000000000 -0400
++++ configure	2011-07-23 14:50:23.436294372 -0400
+@@ -9373,9 +9373,9 @@
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking ffmpeg version" >&5
  $as_echo_n "checking ffmpeg version... " >&6; }
  
@@ -13,3 +13,15 @@
  
      if test x"${ffmpeg_major_version}" != x ; then
  
+@@ -27778,6 +27778,11 @@
+       esac
+     fi
+ 
++#  KDE4_PREFIX override
++    if test x"${with_kde4_prefix}" != x; then
++        KDE4_PREFIX="${with_kde4_prefix}"
++    fi
++
+     if test x"${with_kde4_plugindir}" != x ; then
+       KDE4_PLUGINDIR="${with_kde4_plugindir}"
+     else
diff --git a/graphics/gnash/files/patch-libbase-tu_file.h b/graphics/gnash/files/patch-libbase-tu_file.h
deleted file mode 100644
index 28c2762b65c6..000000000000
--- a/graphics/gnash/files/patch-libbase-tu_file.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libbase/tu_file.h.orig	2010-08-07 19:50:00.000000000 +0400
-+++ libbase/tu_file.h	2010-10-01 20:49:40.000000000 +0400
-@@ -12,6 +12,7 @@
- #include "dsodefs.h" // DSOEXPORT
- #include "utility.h"
- #include "IOChannel.h" // for inheritance
-+#include <cstdio>
- 
- 
- namespace gnash {
diff --git a/graphics/gnash/files/patch-plugin-klash-klash_part.cpp b/graphics/gnash/files/patch-plugin-klash-klash_part.cpp
index edd622becdee..704948946b40 100644
--- a/graphics/gnash/files/patch-plugin-klash-klash_part.cpp
+++ b/graphics/gnash/files/patch-plugin-klash-klash_part.cpp
@@ -1,6 +1,6 @@
---- plugin/klash/klash_part.cpp.orig	2009-03-02 18:29:45.000000000 +0300
-+++ plugin/klash/klash_part.cpp	2009-03-06 05:27:45.000000000 +0300
-@@ -160,7 +160,7 @@
+--- plugin/klash/klash_part.cpp.orig	2011-06-16 18:54:16.833252653 -0400
++++ plugin/klash/klash_part.cpp	2011-06-16 18:54:56.913835639 -0400
+@@ -161,7 +161,7 @@
      QString procname;
      char *gnash_env = getenv("KLASH_PLAYER");
      if (!gnash_env) {
diff --git a/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp b/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp
index 31cd5c7a6f28..d896220545eb 100644
--- a/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp
+++ b/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp
@@ -1,6 +1,6 @@
---- plugin/klash4/klash_part.cpp.orig	2009-03-02 18:29:50.000000000 +0300
-+++ plugin/klash4/klash_part.cpp	2009-03-06 05:44:08.000000000 +0300
-@@ -147,7 +147,7 @@
+--- plugin/klash4/klash_part.cpp.orig	2011-06-16 18:56:30.869545798 -0400
++++ plugin/klash4/klash_part.cpp	2011-06-16 18:57:04.979892841 -0400
+@@ -148,7 +148,7 @@
          }
      }
      KParts::Part::setWidget (new KlashView (wparent));
diff --git a/graphics/gnash/files/patch-plugin-npapi-Makefile.in b/graphics/gnash/files/patch-plugin-npapi-Makefile.in
index 475b813923a2..4de5d901c5b8 100644
--- a/graphics/gnash/files/patch-plugin-npapi-Makefile.in
+++ b/graphics/gnash/files/patch-plugin-npapi-Makefile.in
@@ -1,11 +1,11 @@
---- plugin/npapi/Makefile.in.orig	2010-08-21 22:04:45.000000000 +0400
-+++ plugin/npapi/Makefile.in	2010-08-25 05:43:40.000000000 +0400
-@@ -637,7 +637,7 @@
+--- plugin/npapi/Makefile.in.orig	2011-06-16 18:47:41.180628330 -0400
++++ plugin/npapi/Makefile.in	2011-06-16 18:48:21.950238296 -0400
+@@ -633,7 +633,7 @@
  	-I$(top_srcdir)/libcore/parser -I$(top_srcdir)/libbase \
  	-I$(top_srcdir)/librender -I$(srcdir)/mozilla-sdk \
- 	-I$(srcdir)/mozilla-sdk/include $(GLIB_CFLAGS) $(NULL) \
--	$(am__append_1) $(am__append_2)
-+	$(am__append_1) $(am__append_2) $(BOOST_CFLAGS)
+ 	$(NPAPI_CFLAGS) $(X11_CFLAGS) $(GLIB_CFLAGS) $(NULL) \
+-	$(am__append_1) $(am__append_2) $(am__append_3)
++	$(am__append_1) $(am__append_2) $(am__append_3) $(BOOST_CFLAGS)
  
  # AM_CXXFLAGS = $(AM_CPPFLAGS)
  noinst_HEADERS = plugin.h mozilla-sdk/pluginbase.h \