[148628] trunk/dports/www/webkit2-gtk-devel

[jeremyhu at macports.org]

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

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

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

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-05-13 03:50:40 UTC (rev 148627)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-05-13 05:21:17 UTC (rev 148628)
@@ -22,14 +22,14 @@
 license             LGPL-2+ BSD
 homepage            http://webkitgtk.org/
 
-# r200667
-github.setup        WebKit webkit 216c8d6627f14b7f2d87e9c6d6b640b25c798e5c
-checksums           rmd160  bf04973f848582b962258d593d54ac161382ef76 \
-                    sha256  a73a23fcb70bb9561089633d012a99bac2dd59e21b67483823e2c081cc4d4dc6
+# r200741
+github.setup        WebKit webkit 76ac3f218daae2b98cfae8066886e84056b88dee
+checksums           rmd160  5a5e85162bbeb6256607a7e03fda4ee13be18738 \
+                    sha256  05a00fb6df370cea5825d1577f2c31a77e9ee266958cd9cbe3618ef4af05f093
 
 # version needs to come after github.setup
 version             2.13.0
-revision            11
+revision            12
 epoch               1
 
 # don't overwrite build dependencies provided by cmake portgroup
@@ -72,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-devel/files/PR-157574.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-157574.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157574.patch	2016-05-13 05:21:17 UTC (rev 148628)
@@ -0,0 +1,62 @@
+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 <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 __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
+-
+-#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)
+ #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/20160512/210c862b/attachment.html>