[148658] users/devans/GNOME-3/stable/dports/www/webkit2-gtk
devans at macports.org
devans at macports.org
Fri May 13 13:15:15 PDT 2016
Revision: 148658
https://trac.macports.org/changeset/148658
Author: devans at macports.org
Date: 2016-05-13 13:15:15 -0700 (Fri, 13 May 2016)
Log Message:
-----------
GNOME-3/stable: webkit2-gtk, fix build failures of dependent projects on older systems.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch
users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/www/webkit2-gtk/
Property changes on: users/devans/GNOME-3/stable/dports/www/webkit2-gtk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/www/webkit2-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit2-gtk:146461-148237
+ /branches/mld-qt-481/dports/www/webkit2-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit2-gtk:146461-148657
Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile 2016-05-13 17:25:08 UTC (rev 148657)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile 2016-05-13 20:15:15 UTC (rev 148658)
@@ -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
@@ -70,9 +71,13 @@
# 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-153138.patch \
+ PR-157554.patch \
+ PR-157574.patch
# Build out-of-tree
configure.post_args ../${worksrcdir}
Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch (from rev 148657, trunk/dports/www/webkit2-gtk/files/PR-157554.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch 2016-05-13 20:15:15 UTC (rev 148658)
@@ -0,0 +1,33 @@
+https://bugs.webkit.org/show_bug.cgi?id=157554
+
+--- Source/WTF/wtf/OSRandomSource.cpp
++++ Source/WTF/wtf/OSRandomSource.cpp
+@@ -29,7 +29,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+
+-#if !OS(DARWIN) && OS(UNIX)
++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -46,7 +46,7 @@
+
+ namespace WTF {
+
+-#if !OS(DARWIN) && OS(UNIX)
++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
+ {
+ CRASH();
+@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
+
+ void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
+ {
+-#if OS(DARWIN)
+- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
++#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++ return arc4random_buf(buffer, length);
+ #elif OS(UNIX)
+ int fd = open("/dev/urandom", O_RDONLY, 0);
+ if (fd < 0)
Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch (from rev 148657, trunk/dports/www/webkit2-gtk/files/PR-157574.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch 2016-05-13 20:15:15 UTC (rev 148658)
@@ -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/20160513/7fda6551/attachment.html>
More information about the macports-changes
mailing list