| 1 |
grobian 10/02/03 13:58:50 |
| 2 |
|
| 3 |
Added: webkit-gtk-1.1.15.4-darwin-quartz.patch |
| 4 |
Log: |
| 5 |
Add patch from upstream bugtracker to solve compilation issue on OSX when gtk was built with aqua USE-flag (the default). |
| 6 |
(Portage version: 2.2.00.15187-prefix/cvs/SunOS i386) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.1.15.4-darwin-quartz.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.4-darwin-quartz.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.4-darwin-quartz.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: webkit-gtk-1.1.15.4-darwin-quartz.patch |
| 15 |
=================================================================== |
| 16 |
https://bugs.webkit.org/show_bug.cgi?id=28727 |
| 17 |
https://bugs.webkit.org/attachment.cgi?id=41762 |
| 18 |
|
| 19 |
Index: GNUmakefile.am |
| 20 |
=================================================================== |
| 21 |
--- GNUmakefile.am (revision 49997) |
| 22 |
+++ GNUmakefile.am (working copy) |
| 23 |
@@ -115,6 +115,9 @@ |
| 24 |
if !TARGET_WIN32 |
| 25 |
corekit_cppflags += -DXP_UNIX |
| 26 |
endif |
| 27 |
+if TARGET_QUARTZ |
| 28 |
+corekit_cppflags += -DQUARTZ |
| 29 |
+endif |
| 30 |
|
| 31 |
# Default compiler flags |
| 32 |
global_cflags += \ |
| 33 |
Index: WebCore/plugins/gtk/PluginViewGtk.cpp |
| 34 |
=================================================================== |
| 35 |
--- WebCore/plugins/gtk/PluginViewGtk.cpp (revision 49997) |
| 36 |
+++ WebCore/plugins/gtk/PluginViewGtk.cpp (working copy) |
| 37 |
@@ -59,7 +59,7 @@ |
| 38 |
#include <gdkconfig.h> |
| 39 |
#include <gtk/gtk.h> |
| 40 |
|
| 41 |
-#if defined(XP_UNIX) |
| 42 |
+#if defined(XP_UNIX) && not defined(QUARTZ) |
| 43 |
#include "gtk2xtbin.h" |
| 44 |
#include <gdk/gdkx.h> |
| 45 |
#elif defined(GDK_WINDOWING_WIN32) |
| 46 |
@@ -322,7 +322,7 @@ |
| 47 |
|
| 48 |
switch (variable) { |
| 49 |
case NPNVxDisplay: |
| 50 |
-#if defined(XP_UNIX) |
| 51 |
+#if defined(XP_UNIX) && not defined(QUARTZ) |
| 52 |
if (m_needsXEmbed) |
| 53 |
*(void **)value = (void *)GDK_DISPLAY(); |
| 54 |
else |
| 55 |
@@ -380,7 +380,7 @@ |
| 56 |
#endif |
| 57 |
|
| 58 |
case NPNVnetscapeWindow: { |
| 59 |
-#if defined(XP_UNIX) |
| 60 |
+#if defined(XP_UNIX) and not defined(QUARTZ) |
| 61 |
void* w = reinterpret_cast<void*>(value); |
| 62 |
*((XID *)w) = GDK_WINDOW_XWINDOW(m_parentFrame->view()->hostWindow()->platformPageClient()->window); |
| 63 |
#endif |
| 64 |
@@ -456,8 +456,11 @@ |
| 65 |
setPlatformWidget(gtk_socket_new()); |
| 66 |
gtk_container_add(GTK_CONTAINER(m_parentFrame->view()->hostWindow()->platformPageClient()), platformPluginWidget()); |
| 67 |
g_signal_connect(platformPluginWidget(), "plug_removed", G_CALLBACK(plug_removed_cb), NULL); |
| 68 |
- } else if (m_isWindowed) |
| 69 |
+ } |
| 70 |
+#ifndef QUARTZ |
| 71 |
+ else if (m_isWindowed) |
| 72 |
setPlatformWidget(gtk_xtbin_new(m_parentFrame->view()->hostWindow()->platformPageClient()->window, 0)); |
| 73 |
+#endif |
| 74 |
#else |
| 75 |
setPlatformWidget(gtk_socket_new()); |
| 76 |
gtk_container_add(GTK_CONTAINER(m_parentFrame->view()->hostWindow()->platformPageClient()), platformPluginWidget()); |
| 77 |
@@ -466,7 +469,7 @@ |
| 78 |
|
| 79 |
if (m_isWindowed) { |
| 80 |
m_npWindow.type = NPWindowTypeWindow; |
| 81 |
-#if defined(XP_UNIX) |
| 82 |
+#if defined(XP_UNIX) && not defined(QUARTZ) |
| 83 |
NPSetWindowCallbackStruct *ws = new NPSetWindowCallbackStruct(); |
| 84 |
|
| 85 |
ws->type = 0; |
Archives