[152984] users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel

[devans at macports.org]

Revision: 152984
          https://trac.macports.org/changeset/152984
Author:   devans at macports.org
Date:     2016-09-21 13:14:02 -0700 (Wed, 21 Sep 2016)
Log Message:
-----------
GNOME-3/stable: webkit2-gtk-devel, merge update to version 2.14.0 from trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/


Property changes on: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/www/webkit2-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit2-gtk-devel:151441-152550
   + /branches/mld-qt-481/dports/www/webkit2-gtk-devel:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/www/webkit2-gtk-devel:151441-152983

Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile	2016-09-21 19:05:34 UTC (rev 152983)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile	2016-09-21 20:14:02 UTC (rev 152984)
@@ -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}

Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch (from rev 152983, trunk/dports/www/webkit2-gtk-devel/files/PR-162261.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch	2016-09-21 20:14:02 UTC (rev 152984)
@@ -0,0 +1,24 @@
+diff --git a/Source/WebCore/platform/PlatformPasteboard.h b/Source/WebCore/platform/PlatformPasteboard.h
+index 695bc0e..1bfdfa4 100644
+--- Source/WebCore/platform/PlatformPasteboard.h
++++ Source/WebCore/platform/PlatformPasteboard.h
+@@ -26,6 +26,7 @@
+ #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..3f3c8da 100644
+--- Source/WebCore/platform/gtk/PasteboardHelper.h
++++ Source/WebCore/platform/gtk/PasteboardHelper.h
+@@ -26,6 +26,7 @@
+ #define PasteboardHelper_h
+ 
+ #include "GRefPtrGtk.h"
++#include <functional>
+ #include <wtf/Noncopyable.h>
+ #include <wtf/Vector.h>
+ #include <wtf/glib/GRefPtr.h>

Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch (from rev 152983, trunk/dports/www/webkit2-gtk-devel/files/PR-162302.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch	2016-09-21 20:14:02 UTC (rev 152984)
@@ -0,0 +1,12 @@
+diff --git a/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp b/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
+index 4fed6e9..c58d835 100644
+--- Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
++++ Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
+@@ -33,6 +33,7 @@
+ #include "RenderThemeGadget.h"
+ #include "ScrollView.h"
+ #include "Scrollbar.h"
++#include <cstdlib>
+ #include <gtk/gtk.h>
+ 
+ namespace WebCore {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160921/8ebc316e/attachment.html>