[153194] users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574 .patch

[devans at macports.org]

Revision: 153194
          https://trac.macports.org/changeset/153194
Author:   devans at macports.org
Date:     2016-09-26 14:11:19 -0700 (Mon, 26 Sep 2016)
Log Message:
-----------
GNOME-3/stable: webkit2-gtk, copy PR-157574.patch from webkit2-gtk-devel.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch

Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch	2016-09-26 19:42:01 UTC (rev 153193)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch	2016-09-26 21:11:19 UTC (rev 153194)
@@ -1,11 +1,13 @@
---- Source/JavaScriptCore/API/WebKitAvailability.h.orig	2016-04-27 23:21:38.000000000 -0700
-+++ Source/JavaScriptCore/API/WebKitAvailability.h	2016-05-12 22:22:28.000000000 -0700
-@@ -27,50 +27,11 @@
+diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
+index ab53183..1310dec 100644
+--- Source/JavaScriptCore/API/WebKitAvailability.h
++++ Source/JavaScriptCore/API/WebKitAvailability.h
+@@ -27,57 +27,12 @@
  #define __WebKitAvailability__
  
  #if defined(__APPLE__)
 -
- #include <AvailabilityMacros.h>
+-#include <AvailabilityMacros.h>
  #include <CoreFoundation/CoreFoundation.h>
 -
 -#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
@@ -23,6 +25,10 @@
 -#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
 -#endif
 -
+-#ifndef __NSi_10_12 // Building from trunk rather than SDK.
+-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
 -#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
 -#define __AVAILABILITY_INTERNAL__MAC_10_9
 -#endif
@@ -44,10 +50,13 @@
 -#if defined(BUILDING_GTK__)
  #undef CF_AVAILABLE
  #define CF_AVAILABLE(_mac, _ios)
+ #undef CF_ENUM_AVAILABLE
+ #define CF_ENUM_AVAILABLE(_mac, _ios)
 -#endif
 -
 -#else
 -#define CF_AVAILABLE(_mac, _ios)
+-#define CF_ENUM_AVAILABLE(_mac, _ios)
 -#endif
  
  #endif /* __WebKitAvailability__ */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160926/b8627b62/attachment.html>