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

[jeremyhu at macports.org]

Revision: 148509
          https://trac.macports.org/changeset/148509
Author:   jeremyhu at macports.org
Date:     2016-05-10 20:39:09 -0700 (Tue, 10 May 2016)
Log Message:
-----------
webkit2-gtk-devel: Bump to r200667 and fix a Snow Leopard build failure

Revision Links:
--------------
    https://trac.macports.org/changeset/200667

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

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

Removed Paths:
-------------
    trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-05-11 01:48:31 UTC (rev 148508)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-05-11 03:39:09 UTC (rev 148509)
@@ -22,14 +22,14 @@
 license             LGPL-2+ BSD
 homepage            http://webkitgtk.org/
 
-# r200510
-github.setup        WebKit webkit 9250823768e8147ea831b8b0276f8997fd5f46c5
-checksums           rmd160  844a8adb293f7953dfe6fcdae9fed917474694ae \
-                    sha256  e4ed25f039ff701a6eb4c328dbcf69ebed9c7c865fb878ac8ef16b09420e0552
+# r200667
+github.setup        WebKit webkit 216c8d6627f14b7f2d87e9c6d6b640b25c798e5c
+checksums           rmd160  bf04973f848582b962258d593d54ac161382ef76 \
+                    sha256  a73a23fcb70bb9561089633d012a99bac2dd59e21b67483823e2c081cc4d4dc6
 
 # version needs to come after github.setup
 version             2.13.0
-revision            10
+revision            11
 epoch               1
 
 # don't overwrite build dependencies provided by cmake portgroup
@@ -71,11 +71,11 @@
 
 # PR-152650-2.patch: WIP to re-enable gtk-doc support
 # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
-# PR-157167.patch: https://bugs.webkit.org/show_bug.cgi?id=157167
+# PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
 patchfiles-append \
     PR-152650-2.patch \
     PR-153138.patch \
-    PR-157167.patch
+    PR-157554.patch
 
 # Build out-of-tree
 configure.post_args     ../${worksrcdir}

Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch	2016-05-11 01:48:31 UTC (rev 148508)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch	2016-05-11 03:39:09 UTC (rev 148509)
@@ -1,43 +0,0 @@
-From 3d24c6b683a97978482842f7c1c523a78c977061 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Fri, 6 May 2016 00:09:27 -0700
-Subject: [PATCH] Fix an incorrect usage of OS(DARWIN) with PLATFORM(COCOA)
-
-https://bugs.webkit.org/show_bug.cgi?id=157167
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- Source/WebCore/ChangeLog                            | 10 ++++++++++
- Source/WebCore/platform/graphics/FontPlatformData.h | 10 ++++++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
---- Source/WebCore/platform/graphics/FontPlatformData.h
-+++ Source/WebCore/platform/graphics/FontPlatformData.h
-@@ -167,9 +167,11 @@ public:
- 
-     unsigned hash() const
-     {
--#if PLATFORM(WIN) && !USE(CAIRO)
-+#if USE(CAIRO)
-+        return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get());
-+#elif PLATFORM(WIN)
-         return m_font ? m_font->hash() : 0;
--#elif OS(DARWIN)
-+#elif PLATFORM(COCOA)
-         uintptr_t flags = static_cast<uintptr_t>(m_isHashTableDeletedValue << 5 | m_textRenderingMode << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique);
- #if USE(APPKIT)
-         uintptr_t fontHash = (uintptr_t)m_font.get();
-@@ -178,8 +180,8 @@ public:
- #endif
-         uintptr_t hashCodes[3] = { fontHash, m_widthVariant, flags };
-         return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
--#elif USE(CAIRO)
--        return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get());
-+#else
-+#error "Unsupported configuration"
- #endif
-     }
- 
--- 
-2.8.1
-

Added: trunk/dports/www/webkit2-gtk-devel/files/PR-157554.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-157554.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157554.patch	2016-05-11 03:39:09 UTC (rev 148509)
@@ -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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160510/191885fb/attachment.html>