[148384] trunk/dports/www/webkit2-gtk-devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri May 6 09:39:27 PDT 2016
Revision: 148384
https://trac.macports.org/changeset/148384
Author: jeremyhu at macports.org
Date: 2016-05-06 09:39:27 -0700 (Fri, 06 May 2016)
Log Message:
-----------
webkit2-gtk-devel: Bump to r200510
Revision Links:
--------------
https://trac.macports.org/changeset/200510
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk-devel/Portfile
Added Paths:
-----------
trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch
Removed Paths:
-------------
trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch
Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile 2016-05-06 16:37:22 UTC (rev 148383)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile 2016-05-06 16:39:27 UTC (rev 148384)
@@ -14,8 +14,6 @@
name webkit2-gtk-devel
conflicts webkit2-gtk
-version 2.13.0
-revision 9
description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers jeremyhu devans
@@ -24,15 +22,15 @@
license LGPL-2+ BSD
homepage http://webkitgtk.org/
-# r200216 -- has issue with m_font (https://bugs.webkit.org/show_bug.cgi?id=157167)
-#github.setup WebKit webkit 999e572d853fe32b9fb11955bc1a8f7ed97632c7
-#checksums rmd160 761d51bd5f7878efe08b3f7e586fcbd0444fd9fa \
-# sha256 f5772d6fb4609d0cf335704fe40eacb15b5e3fe7e267f00a8ffa24c444ea3aa2
+# r200510
+github.setup WebKit webkit 9250823768e8147ea831b8b0276f8997fd5f46c5
+checksums rmd160 844a8adb293f7953dfe6fcdae9fed917474694ae \
+ sha256 e4ed25f039ff701a6eb4c328dbcf69ebed9c7c865fb878ac8ef16b09420e0552
-# r200069
-github.setup WebKit webkit 20484cc465bfbd872275a774549560cb16fb4997
-checksums rmd160 67364a2406d722a7fcebda0110cc6c0821316163 \
- sha256 d670bed23113423ccb01cf8bedc5580068ccd4dc65b704e1821257f817adef38
+# version needs to come after github.setup
+version 2.13.0
+revision 10
+epoch 1
# don't overwrite build dependencies provided by cmake portgroup
depends_build-append \
@@ -73,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-157182.patch: https://bugs.webkit.org/show_bug.cgi?id=157182
+# PR-157167.patch: https://bugs.webkit.org/show_bug.cgi?id=157167
patchfiles-append \
PR-152650-2.patch \
PR-153138.patch \
- PR-157182.patch
+ PR-157167.patch
# Build out-of-tree
configure.post_args ../${worksrcdir}
Added: trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157167.patch 2016-05-06 16:39:27 UTC (rev 148384)
@@ -0,0 +1,43 @@
+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
+
Deleted: trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch 2016-05-06 16:37:22 UTC (rev 148383)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-157182.patch 2016-05-06 16:39:27 UTC (rev 148384)
@@ -1,38 +0,0 @@
-commit 9d9a9921add35954bc436b0d8f9adfd732698e77
-Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Fri Apr 29 09:47:21 2016 -0700
-
- [GTK] Fix build failure introduced by r199738
-
- https://bugs.webkit.org/show_bug.cgi?id=157182
-
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-
-diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
-index 8248f6a..78a0b1f 100644
---- Source/WebCore/CMakeLists.txt
-+++ Source/WebCore/CMakeLists.txt
-@@ -3274,6 +3274,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PruneEmptyDeclarations.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
-+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveDynamicIndexing.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemovePow.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RewriteDoWhile.cpp
-@@ -3281,6 +3282,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SearchSymbol.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateArrayInitialization.cpp
-+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateExpressionsReturningArrays.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/SeparateDeclarations.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderLang.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ShaderVars.cpp
-@@ -3291,6 +3293,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/TranslatorHLSL.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Types.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitAST.cpp
-+ ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UnfoldShortCircuitToIf.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UniformHLSL.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/util.cpp
- ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/UtilsHLSL.cpp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160506/58c5048e/attachment.html>
More information about the macports-changes
mailing list