[111060] trunk/dports/www/webkit-gtk

[jeremyhu at macports.org]

Revision: 111060
          https://trac.macports.org/changeset/111060
Author:   jeremyhu at macports.org
Date:     2013-09-13 20:58:22 -0700 (Fri, 13 Sep 2013)
Log Message:
-----------
webkit-gtk: Fix +quartz (#39898)

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/quartz-webcore.patch

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-09-14 01:58:55 UTC (rev 111059)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-09-14 03:58:22 UTC (rev 111060)
@@ -53,6 +53,7 @@
 # execinfo.patch: https://trac.macports.org/ticket/37882
 # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
 # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
+# quartz-webcore.patch: No upstream bug, http://trac.macports.org/ticket/39898
 
 patchfiles \
         clang-assertions.patch \
@@ -62,7 +63,8 @@
         ruby-1.8.patch \
         ListableHandler.patch \
         ppc.patch \
-        tiger.patch
+        tiger.patch \
+        quartz-webcore.patch
 
 conflicts_build     google-test
 

Added: trunk/dports/www/webkit-gtk/files/quartz-webcore.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz-webcore.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/quartz-webcore.patch	2013-09-14 03:58:22 UTC (rev 111060)
@@ -0,0 +1,33 @@
+--- Source/WebCore/bridge/npruntime_internal-orig.h	2013-07-19 00:04:01.000000000 -0700
++++ Source/WebCore/bridge/npruntime_internal.h	2013-08-12 16:04:17.000000000 -0700
+@@ -29,7 +29,7 @@
+ #include "npfunctions.h"
+ #include "npruntime.h"
+ 
+-#ifdef XP_UNIX
++#if PLATFORM(X11)
+     #include <X11/Xresource.h>
+ 
+     #undef None
+--- Source/WebCore/plugins/PluginView-orig.cpp	2013-07-19 00:04:11.000000000 -0700
++++ Source/WebCore/plugins/PluginView.cpp	2013-08-12 17:48:20.000000000 -0700
+@@ -865,7 +865,7 @@
+     , m_contextRef(0)
+     , m_fakeWindow(0)
+ #endif
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+     , m_hasPendingGeometryChange(true)
+     , m_drawable(0)
+     , m_visual(0)
+--- Source/WebCore/plugins/PluginView-orig.h	2013-07-19 00:04:11.000000000 -0700
++++ Source/WebCore/plugins/PluginView.h	2013-08-12 16:09:21.000000000 -0700
+@@ -427,7 +427,7 @@
+         Point mousePosForPlugin(MouseEvent* event = 0) const;
+ #endif
+ 
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+         bool m_hasPendingGeometryChange;
+         Pixmap m_drawable;
+         Visual* m_visual;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130913/af911b2e/attachment.html>