[148629] trunk/dports/www/webkit2-gtk

[jeremyhu at macports.org]

Revision: 148629
          https://trac.macports.org/changeset/148629
Author:   jeremyhu at macports.org
Date:     2016-05-12 22:24:26 -0700 (Thu, 12 May 2016)
Log Message:
-----------
webkit2-gtk: Fix build failures of dependent projects on older systems

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

Added Paths:
-----------
    trunk/dports/www/webkit2-gtk/files/PR-157574.patch

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-05-13 05:21:17 UTC (rev 148628)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-05-13 05:24:26 UTC (rev 148629)
@@ -14,6 +14,7 @@
 name                webkit2-gtk
 conflicts           webkit2-gtk-devel
 version             2.12.2
+revision            1
 description         Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
 long_description    ${description}
 maintainers         jeremyhu devans
@@ -71,10 +72,12 @@
 # PR-152650-2.patch: WIP to re-enable gtk-doc support
 # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
 # PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
+# PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
 patchfiles-append \
     PR-152650-2.patch \
     PR-153138.patch \
-    PR-157554.patch
+    PR-157554.patch \
+    PR-157574.patch
 
 # Build out-of-tree
 configure.post_args     ../${worksrcdir}

Added: trunk/dports/www/webkit2-gtk/files/PR-157574.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-157574.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-157574.patch	2016-05-13 05:24:26 UTC (rev 148629)
@@ -0,0 +1,53 @@
+--- 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 @@
+ #define __WebKitAvailability__
+ 
+ #if defined(__APPLE__)
+-
+ #include <AvailabilityMacros.h>
+ #include <CoreFoundation/CoreFoundation.h>
+-
+-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+-/* To support availability macros that mention newer OS X versions when building on older OS X versions,
+-   we provide our own definitions of the underlying macros that the availability macros expand to. We're
+-   free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
+-   an application rather than as part of the system.
+-*/
+-
+-#ifndef __NSi_10_10 // Building from trunk rather than SDK.
+-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
+-#ifndef __NSi_10_11 // Building from trunk rather than SDK.
+-#define __NSi_10_11 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
+-
+-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
+-#define __AVAILABILITY_INTERNAL__MAC_10_10
+ #endif
+ 
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+-#endif
+-
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
+-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
+-#endif
+-
+-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
+-
+-#if defined(BUILDING_GTK__)
+ #undef CF_AVAILABLE
+ #define CF_AVAILABLE(_mac, _ios)
+-#endif
+-
+-#else
+-#define CF_AVAILABLE(_mac, _ios)
+-#endif
+ 
+ #endif /* __WebKitAvailability__ */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160512/8f8c2a85/attachment-0001.html>