[mingw-webkitgtk: 12/36] Backported an already upstreamed patch

[Kalev Lember]

commit 329ffc984ccb39e926e482b961539c7ab4daea3a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Apr 28 20:38:03 2011 +0200

    Backported an already upstreamed patch
    
    Backported an already upstreamed patch and dropped the relevant parts from our own (non-upstreamed yet) patch

 changeset_r84071.diff  |   86 ++++++++++++++++++++++++++++++++++++++++++++++++
 mingw32-webkitgtk.spec |   10 +++++-
 2 files changed, 95 insertions(+), 1 deletions(-)
---
diff --git a/changeset_r84071.diff b/changeset_r84071.diff
new file mode 100644
index 0000000..9814566
--- /dev/null
+++ b/changeset_r84071.diff
@@ -0,0 +1,86 @@
+Index: Source/WebCore/plugins/PluginView.h
+===================================================================
+--- Source/WebCore/plugins/PluginView.h	(revision 79526)
++++ Source/WebCore/plugins/PluginView.h	(revision 84071)
+@@ -391,5 +391,5 @@
+ private:
+ 
+-#if defined(XP_UNIX) || OS(SYMBIAN)
++#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
+         void setNPWindowIfNeeded();
+ #elif defined(XP_MACOSX)
+Index: Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+===================================================================
+--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp	(revision 82962)
++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp	(revision 84071)
+@@ -47,6 +47,7 @@
+ #include "Image.h"
+ #include "KeyboardEvent.h"
+ #include "MouseEvent.h"
++#include "NotImplemented.h"
+ #include "Page.h"
+ #include "PlatformKeyboardEvent.h"
+ #include "PlatformMouseEvent.h"
+@@ -663,5 +664,5 @@
+             *static_cast<Window*>(value) = GDK_WINDOW_XWINDOW(gdk_window_get_toplevel(gdkWindow));
+ #elif defined(GDK_WINDOWING_WIN32)
+-            *static_cast<HGIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
++            *static_cast<HGDIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
+ #endif
+             *result = NPERR_NO_ERROR;
+@@ -709,4 +710,5 @@
+ }
+ 
++#ifndef GDK_WINDOWING_WIN32
+ static Display* getPluginDisplay()
+ {
+@@ -722,4 +724,5 @@
+ #endif
+ }
++#endif
+ 
+ #if defined(XP_UNIX)
+@@ -786,4 +789,5 @@
+     ASSERT(m_status == PluginStatusLoadedSuccessfully);
+ 
++#if defined(XP_UNIX)
+     if (m_plugin->pluginFuncs()->getvalue) {
+         PluginView::setCurrentPluginView(this);
+@@ -794,9 +798,9 @@
+         PluginView::setCurrentPluginView(0);
+     }
++#endif
+ 
+     if (m_isWindowed) {
+-#if defined(XP_UNIX)
+         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
+-
++#if defined(XP_UNIX)
+         if (m_needsXEmbed) {
+             // If our parent is not anchored the startup process will
+@@ -820,5 +824,7 @@
+     } else {
+         setPlatformWidget(0);
++#if defined(XP_UNIX)
+         m_pluginDisplay = getPluginDisplay();
++#endif
+     }
+ 
+Index: Source/WebCore/plugins/PluginView.cpp
+===================================================================
+--- Source/WebCore/plugins/PluginView.cpp	(revision 79988)
++++ Source/WebCore/plugins/PluginView.cpp	(revision 84071)
+@@ -341,5 +341,5 @@
+ 
+ #if ENABLE(NETSCAPE_PLUGIN_API)
+-#ifdef XP_WIN
++#if defined(XP_WIN) && !PLATFORM(GTK)
+     // Unsubclass the window
+     if (m_isWindowed) {
+@@ -356,5 +356,5 @@
+ #endif
+     }
+-#endif // XP_WIN
++#endif // !defined(XP_WIN) || PLATFORM(GTK)
+ #endif // ENABLE(NETSCAPE_PLUGIN_API)
+ 
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index 7b48ed0..6c0c379 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -48,7 +48,7 @@
 
 Name:		mingw32-webkitgtk
 Version:	1.4.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	MinGW Windows web content engine library
 
 Group:		Development/Libraries
@@ -88,6 +88,9 @@ Patch6:		changeset_r82701.diff
 # https://bugs.webkit.org/show_bug.cgi?id=59702
 Patch7:		javascriptcore-winver.patch
 
+# Fix compilation of the plugins part of WebKit
+Patch8:		changeset_r84071.diff
+
 BuildArch:	noarch
 
 BuildRequires:	bison
@@ -148,6 +151,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
 #%patch5 -p0 -b .libpng15_2
 %patch6 -p0 -b .pango
 %patch7 -p1 -b .winver
+%patch8 -p0 -b .plugins
 
 
 %build
@@ -211,6 +215,10 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
 
 
 %changelog
+* Thu Apr 28 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.0-3
+- Backported an already upstreamed patch and dropped the relevant
+  parts from our own (non-upstreamed yet) patch
+
 * Thu Apr 28 2011 Kalev Lember <kalev at smartlink.ee> - 1.4.0-2
 - Replaced TimerQueueTimer related reverts with a single upstreamable patch