[gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-1.2.5-darwin-quartz.patch webkit-gtk-1.2.5-darwin8.patch

[Fabian Groffen (grobian)]

grobian     10/11/25 07:25:39

  Added:                webkit-gtk-1.2.5-darwin-quartz.patch
                        webkit-gtk-1.2.5-darwin8.patch
  Log:
  Re-introduce USE=aqua, add necessary patches
  
  (Portage version: 2.2.01.17168-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.1                  net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch?rev=1.1&content-type=text/plain

Index: webkit-gtk-1.2.5-darwin-quartz.patch
===================================================================
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt

--- WebCore/plugins/gtk/gtk2xtbin.c.orig	2010-09-10 06:20:33.000000000 -0700
+++ WebCore/plugins/gtk/gtk2xtbin.c	2010-10-06 09:45:37.000000000 -0700
@@ -41,7 +41,7 @@
  * The GtkXtBin widget allows for Xt toolkit code to be used
  * inside a GTK application.  
  */
-
+#if 0
 #include "GtkVersioning.h"
 #include "xembed.h"
 #include "gtk2xtbin.h"
@@ -951,3 +951,4 @@
 
   return;
 }
+#endif
--- WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2010-09-10 06:20:33.000000000 -0700
+++ WebCore/plugins/gtk/PluginViewGtk.cpp	2010-10-06 09:45:37.000000000 -0700
@@ -60,10 +60,13 @@
 #include "runtime_root.h"
 #include <runtime/JSLock.h>
 #include <runtime/JSValue.h>
+#include "NotImplemented.h"
 
 #include <gdkconfig.h>
 #include <gtk/gtk.h>
 
+#undef XP_UNIX
+
 #if defined(XP_UNIX)
 #include "gtk2xtbin.h"
 #define Bool int // this got undefined somewhere
@@ -441,9 +444,9 @@
         event->setDefaultHandled();
 }
 
-#if defined(XP_UNIX)
 void PluginView::handleFocusInEvent()
 {
+#if defined(XP_UNIX)
     XEvent npEvent;
     initXEvent(&npEvent);
 
@@ -453,10 +456,12 @@
     event.detail = NotifyDetailNone;
 
     dispatchNPEvent(npEvent);
+#endif
 }
 
 void PluginView::handleFocusOutEvent()
 {
+#if defined(XP_UNIX)
     XEvent npEvent;
     initXEvent(&npEvent);
 
@@ -466,8 +471,8 @@
     event.detail = NotifyDetailNone;
 
     dispatchNPEvent(npEvent);
-}
 #endif
+}
 
 void PluginView::setParent(ScrollView* parent)
 {
@@ -797,8 +802,8 @@
     }
 
     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



1.1                  net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch?rev=1.1&content-type=text/plain

Index: webkit-gtk-1.2.5-darwin8.patch
===================================================================
https://bugs.webkit.org/show_bug.cgi?id=39847

additionally, also on Darwin8 glib stuff includes system headers that
use isascii, so we can't have it die on that.

--- JavaScriptCore/wtf/FastMalloc.cpp
+++ JavaScriptCore/wtf/FastMalloc.cpp
@@ -1381,14 +1381,12 @@
   // Bytes allocated from system
   uint64_t system_bytes_;
 
-#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
   // Number of pages kept in free lists that are still committed.
   Length free_committed_pages_;
 
   // Minimum number of free committed pages since last scavenge. (Can be 0 if
   // we've committed new pages since the last scavenge.)
   Length min_free_committed_pages_since_last_scavenge_;
-#endif
 
   bool GrowHeap(Length n);
 
--- WebCore/config.h
+++ WebCore/config.h
@@ -125,7 +125,7 @@
 // this breaks compilation of <QFontDatabase>, at least, so turn it off for now
 // Also generates errors on wx on Windows, presumably because these functions
 // are used from wx headers.
-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
+#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(BUILDING_ON_TIGER)
 #include <wtf/DisallowCType.h>
 #endif