| 1 |
grobian 11/11/29 19:01:02 |
| 2 |
|
| 3 |
Modified: webkit-gtk-1.2.5-darwin-quartz.patch |
| 4 |
Added: webkit-gtk-1.6.1-darwin-quartz.patch |
| 5 |
Log: |
| 6 |
Fix darwin-quartz patch, drop darwin8 patch from ebuild, bug #392385 |
| 7 |
|
| 8 |
(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: webkit-gtk-1.2.5-darwin-quartz.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- webkit-gtk-1.2.5-darwin-quartz.patch 25 Nov 2010 07:25:39 -0000 1.1 |
| 24 |
+++ webkit-gtk-1.2.5-darwin-quartz.patch 29 Nov 2011 19:01:02 -0000 1.2 |
| 25 |
@@ -1,8 +1,8 @@ |
| 26 |
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt |
| 27 |
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt |
| 28 |
|
| 29 |
---- WebCore/plugins/gtk/gtk2xtbin.c.orig 2010-09-10 06:20:33.000000000 -0700 |
| 30 |
-+++ WebCore/plugins/gtk/gtk2xtbin.c 2010-10-06 09:45:37.000000000 -0700 |
| 31 |
+--- Source/WebCore/plugins/gtk/gtk2xtbin.c |
| 32 |
++++ Source/WebCore/plugins/gtk/gtk2xtbin.c |
| 33 |
@@ -41,7 +41,7 @@ |
| 34 |
* The GtkXtBin widget allows for Xt toolkit code to be used |
| 35 |
* inside a GTK application. |
| 36 |
@@ -17,8 +17,8 @@ |
| 37 |
return; |
| 38 |
} |
| 39 |
+#endif |
| 40 |
---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2010-09-10 06:20:33.000000000 -0700 |
| 41 |
-+++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-10-06 09:45:37.000000000 -0700 |
| 42 |
+--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp |
| 43 |
++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp |
| 44 |
@@ -60,10 +60,13 @@ |
| 45 |
#include "runtime_root.h" |
| 46 |
#include <runtime/JSLock.h> |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: webkit-gtk-1.6.1-darwin-quartz.patch |
| 56 |
=================================================================== |
| 57 |
Original from: |
| 58 |
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt |
| 59 |
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt |
| 60 |
|
| 61 |
Adapted for 1.6.1 |
| 62 |
|
| 63 |
--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp |
| 64 |
+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp |
| 65 |
@@ -70,6 +70,8 @@ |
| 66 |
#endif |
| 67 |
#include <gtk/gtk.h> |
| 68 |
|
| 69 |
+#undef XP_UNIX |
| 70 |
+ |
| 71 |
#if defined(XP_UNIX) |
| 72 |
#include "RefPtrCairo.h" |
| 73 |
#include "gtk2xtbin.h" |
| 74 |
@@ -439,9 +441,9 @@ |
| 75 |
event->setDefaultHandled(); |
| 76 |
} |
| 77 |
|
| 78 |
-#if defined(XP_UNIX) |
| 79 |
void PluginView::handleFocusInEvent() |
| 80 |
{ |
| 81 |
+#if defined(XP_UNIX) |
| 82 |
if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) |
| 83 |
return; |
| 84 |
|
| 85 |
@@ -454,10 +456,12 @@ |
| 86 |
event.detail = NotifyDetailNone; |
| 87 |
|
| 88 |
dispatchNPEvent(npEvent); |
| 89 |
+#endif |
| 90 |
} |
| 91 |
|
| 92 |
void PluginView::handleFocusOutEvent() |
| 93 |
{ |
| 94 |
+#if defined(XP_UNIX) |
| 95 |
if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) |
| 96 |
return; |
| 97 |
|
| 98 |
@@ -470,8 +474,8 @@ |
| 99 |
event.detail = NotifyDetailNone; |
| 100 |
|
| 101 |
dispatchNPEvent(npEvent); |
| 102 |
-} |
| 103 |
#endif |
| 104 |
+} |
| 105 |
|
| 106 |
void PluginView::setParent(ScrollView* parent) |
| 107 |
{ |
| 108 |
--- Source/WebCore/plugins/gtk/gtk2xtbin.c |
| 109 |
+++ Source/WebCore/plugins/gtk/gtk2xtbin.c |
| 110 |
@@ -41,7 +41,7 @@ |
| 111 |
* The GtkXtBin widget allows for Xt toolkit code to be used |
| 112 |
* inside a GTK application. |
| 113 |
*/ |
| 114 |
- |
| 115 |
+#if 0 |
| 116 |
#include "GtkVersioning.h" |
| 117 |
#include "xembed.h" |
| 118 |
#include "gtk2xtbin.h" |
| 119 |
@@ -966,3 +966,4 @@ |
| 120 |
|
| 121 |
return; |
| 122 |
} |
| 123 |
+#endif |
Archives