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

[jeremyhu at macports.org]

Revision: 152917
          https://trac.macports.org/changeset/152917
Author:   jeremyhu at macports.org
Date:     2016-09-20 10:54:26 -0700 (Tue, 20 Sep 2016)
Log Message:
-----------
webkit2-gtk-devel: Bump to 2.14.0

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

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

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-09-20 17:51:38 UTC (rev 152916)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-09-20 17:54:26 UTC (rev 152917)
@@ -28,7 +28,7 @@
 #                    sha256  3ae58d6c15052cae2ad1c76fa0ecb7c63555671d4f7fc2a16bbbf5b83977124a
 
 # version needs to come after github.setup
-version             2.13.91
+version             2.14.0
 revision            0
 epoch               1
 
@@ -37,8 +37,8 @@
 distname            webkitgtk-${version}
 dist_subdir         webkit-gtk
 
-checksums           rmd160  07aecba3a1b84903c0fcd52bc7b996071a4980c6 \
-                    sha256  ba5ce8ea2421b99aebb44638e744241d828f1531d4163741c0fad09682ce2026
+checksums           rmd160  25116c98970867950e5b2e8e3506527aa2a9021c \
+                    sha256  0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a
 
 # don't overwrite build dependencies provided by cmake portgroup
 depends_build-append \
@@ -81,11 +81,15 @@
 # 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
+# PR-162261.patch: https://bugs.webkit.org/show_bug.cgi?id=162261
+# PR-162302.patch: https://bugs.webkit.org/show_bug.cgi?id=162302
 patchfiles-append \
     PR-152650-2.patch \
     PR-153138.patch \
     PR-157554.patch \
-    PR-157574.patch
+    PR-157574.patch \
+    PR-162261.patch \
+    PR-162302.patch
 
 # Build out-of-tree
 configure.post_args     ../${worksrcdir}

Added: trunk/dports/www/webkit2-gtk-devel/files/PR-162261.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-162261.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-162261.patch	2016-09-20 17:54:26 UTC (rev 152917)
@@ -0,0 +1,26 @@
+diff --git a/Source/WebCore/platform/PlatformPasteboard.h b/Source/WebCore/platform/PlatformPasteboard.h
+index 695bc0e..529ba13 100644
+--- Source/WebCore/platform/PlatformPasteboard.h
++++ Source/WebCore/platform/PlatformPasteboard.h
+@@ -26,6 +26,8 @@
+ #ifndef PlatformPasteboard_h
+ #define PlatformPasteboard_h
+ 
++#include <functional>
++
+ #include <wtf/Forward.h>
+ #include <wtf/RefCounted.h>
+ #include <wtf/RetainPtr.h>
+diff --git a/Source/WebCore/platform/gtk/PasteboardHelper.h b/Source/WebCore/platform/gtk/PasteboardHelper.h
+index b15fbef..f98230d 100644
+--- Source/WebCore/platform/gtk/PasteboardHelper.h
++++ Source/WebCore/platform/gtk/PasteboardHelper.h
+@@ -25,6 +25,8 @@
+ #ifndef PasteboardHelper_h
+ #define PasteboardHelper_h
+ 
++#include <functional>
++
+ #include "GRefPtrGtk.h"
+ #include <wtf/Noncopyable.h>
+ #include <wtf/Vector.h>

Added: trunk/dports/www/webkit2-gtk-devel/files/PR-162302.patch
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/files/PR-162302.patch	                        (rev 0)
+++ trunk/dports/www/webkit2-gtk-devel/files/PR-162302.patch	2016-09-20 17:54:26 UTC (rev 152917)
@@ -0,0 +1,19 @@
+diff --git a/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp b/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
+index 4fed6e9..34dfe25 100644
+--- Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
++++ Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
+@@ -544,12 +544,12 @@ bool ScrollbarThemeGtk::paint(Scrollbar& scrollbar, GraphicsContext& graphicsCon
+     if (scrollbar.orientation() == VerticalScrollbar) {
+         if (rect.width() != preferredSize.width()) {
+             if (!scrollbarOnLeft)
+-                contentsRect.move(std::abs(rect.width() - preferredSize.width()), 0);
++                contentsRect.move(std::abs((double)(rect.width() - preferredSize.width())), 0);
+             contentsRect.setWidth(preferredSize.width());
+         }
+     } else {
+         if (rect.height() != preferredSize.height()) {
+-            contentsRect.move(0, std::abs(rect.height() - preferredSize.height()));
++            contentsRect.move(0, std::abs((double)(rect.height() - preferredSize.height())));
+             contentsRect.setHeight(preferredSize.height());
+         }
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160920/c62cffb2/attachment.html>