[139265] users/devans/GNOME-3/stable/dports/www/webkit-gtk

[devans at macports.org]

Revision: 139265
          https://trac.macports.org/changeset/139265
Author:   devans at macports.org
Date:     2015-08-09 20:12:10 -0700 (Sun, 09 Aug 2015)
Log Message:
-----------
GNOME-3/stable: webkit-gtk, update patches to fix +quartz build (#47829, #48419).

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/www/webkit-gtk/


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit-gtk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk:127269-139222
   + /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit-gtk:127269-139264

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch	2015-08-10 03:00:37 UTC (rev 139264)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch	2015-08-10 03:12:10 UTC (rev 139265)
@@ -1,6 +1,6 @@
 --- Source/WTF/wtf/Assertions.h.orig	2013-01-18 15:03:57.000000000 -0800
 +++ Source/WTF/wtf/Assertions.h	2013-01-18 15:04:46.000000000 -0800
-@@ -381,7 +381,8 @@ while (0)
+@@ -371,7 +371,8 @@ while (0)
  // a function. Hence it uses macro naming convention.
  #pragma clang diagnostic push
  #pragma clang diagnostic ignored "-Wmissing-noreturn"

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch	2015-08-10 03:00:37 UTC (rev 139264)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch	2015-08-10 03:12:10 UTC (rev 139265)
@@ -1,6 +1,6 @@
 --- Source/WTF/wtf/Platform.h.orig	2015-01-06 13:30:52.000000000 -0800
 +++ Source/WTF/wtf/Platform.h	2015-01-06 13:42:15.000000000 -0800
-@@ -587,11 +587,14 @@
+@@ -590,11 +590,14 @@
  
  #if OS(DARWIN)
  

Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch	2015-08-10 03:00:37 UTC (rev 139264)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch	2015-08-10 03:12:10 UTC (rev 139265)
@@ -1,18 +1,18 @@
---- 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 @@
+--- Source/WebCore/plugins/PluginView.cpp.orig	2015-05-20 02:03:24.000000000 -0700
++++ Source/WebCore/plugins/PluginView.cpp	2015-08-08 15:02:30.000000000 -0700
+@@ -839,7 +839,7 @@
+ #if defined(XP_MACOSX)
      , 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;
+--- Source/WebCore/plugins/PluginView.h.orig	2015-05-20 02:03:24.000000000 -0700
++++ Source/WebCore/plugins/PluginView.h	2015-08-08 15:02:30.000000000 -0700
+@@ -378,7 +378,7 @@
+         void setNPWindowIfNeeded();
  #endif
  
 -#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
@@ -20,3 +20,17 @@
          bool m_hasPendingGeometryChange;
          Pixmap m_drawable;
          Visual* m_visual;
+--- Source/WebCore/GNUmakefile.list.am.orig	2015-06-16 09:12:37.000000000 +0200
++++ Source/WebCore/GNUmakefile.list.am	2015-06-16 09:13:38.000000000 +0200
+@@ -6315,11 +6315,9 @@
+ 
+ if TARGET_QUARTZ
+ if !TARGET_X11
+-if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
+-endif # END ENABLE_WEBKIT2
+ endif # END !TARGET_X11
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150809/9f54d867/attachment.html>