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

devans at macports.org devans at macports.org
Sat Oct 29 00:42:59 CEST 2016 

Revision: 154405
          https://trac.macports.org/changeset/154405
Author:   devans at macports.org
Date:     2016-10-29 00:42:59 +0200 (Sat, 29 Oct 2016)
Log Message:
-----------
GNOME-3/stable: webkit2-gtk-devel, bump to current trunk (r207192), disable GRAPHICS_CONTEXT_3D for +quartz (#52495).

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

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-163340.patch
    users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch

Removed 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/

Index: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel	2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel	2016-10-28 22:42:59 UTC (rev 154405)

Property changes on: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
 /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-153511
\ No newline at end of property
+/trunk/dports/www/webkit2-gtk-devel:151441-154404
\ No newline at end of property
Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile	2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/Portfile	2016-10-28 22:42:59 UTC (rev 154405)
@@ -10,7 +10,7 @@
 PortGroup           cmake 1.0
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cxx11 1.0
-#PortGroup           github 1.0
+PortGroup           github 1.0
 
 name                webkit2-gtk-devel
 conflicts           webkit2-gtk
@@ -22,23 +22,23 @@
 license             LGPL-2+ BSD
 homepage            http://webkitgtk.org/
 
-# r202372
-#github.setup        WebKit webkit 63f4f7120dfbc0235b90e6d2f2c68be36895d067
-#checksums           rmd160  3fd91e14df1668b34bf1cb2bb4ab19526a68b7eb \
-#                    sha256  3ae58d6c15052cae2ad1c76fa0ecb7c63555671d4f7fc2a16bbbf5b83977124a
+# r207192
+github.setup        WebKit webkit 91ef51ea3f538ade6f168a1d701dab90bfbee4db
+checksums           rmd160  d8352cc158d68a22a2910d503fa70b447de4224d \
+                    sha256  ae1311360a5b54fb01596057986e9a9be07f34ed176d8777e4f2b9d39c2b4f53
 
 # version needs to come after github.setup
-version             2.14.0
+version             2.14.90
 revision            0
 epoch               1
 
-master_sites        http://webkitgtk.org/releases/
-use_xz              yes
-distname            webkitgtk-${version}
+#master_sites        http://webkitgtk.org/releases/
+#use_xz              yes
+#distname            webkitgtk-${version}
 dist_subdir         webkit-gtk
 
-checksums           rmd160  25116c98970867950e5b2e8e3506527aa2a9021c \
-                    sha256  0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a
+#checksums           rmd160  e8274de845d1314c497f84ccd88ed602995c1e56 \
+#                    sha256  2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5
 
 # don't overwrite build dependencies provided by cmake portgroup
 depends_build-append \
@@ -81,15 +81,14 @@
 # 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
+# PR-163340.patch: https://bugs.webkit.org/show_bug.cgi?id=163340
+# PR-163346.patch: https://bugs.webkit.org/show_bug.cgi?id=163346
 patchfiles-append \
-    PR-152650-2.patch \
     PR-153138.patch \
     PR-157554.patch \
     PR-157574.patch \
-    PR-162261.patch \
-    PR-162302.patch
+    PR-163340.patch \
+    PR-163346.patch
 
 # Build out-of-tree
 configure.post_args     ../${worksrcdir}
@@ -168,7 +167,8 @@
     configure.args-append \
         -DENABLE_QUARTZ_TARGET=ON \
         -DENABLE_X11_TARGET=OFF \
-        -DENABLE_OPENGL=OFF
+        -DENABLE_OPENGL=OFF \
+        -DENABLE_GRAPHICS_CONTEXT_3D=OFF
 }
 
 variant x11 conflicts quartz {
@@ -201,7 +201,7 @@
     default_variants-append +x11 +gtk2
 }
 
-#livecheck.type      none
-livecheck.type      regex
-livecheck.url       http://webkitgtk.org/releases/
-livecheck.regex     "webkitgtk-(\\d+\\.\\d*\[134579\](?:\\.\\d+)*)"
+livecheck.type      none
+#livecheck.type      regex
+#livecheck.url       http://webkitgtk.org/releases/
+#livecheck.regex     "webkitgtk-(\\d+\\.\\d*\[134579\](?:\\.\\d+)*)"

Deleted: 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-162261.patch	2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162261.patch	2016-10-28 22:42:59 UTC (rev 154405)
@@ -1,24 +0,0 @@
-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>

Deleted: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch	2016-10-28 22:38:20 UTC (rev 154404)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-162302.patch	2016-10-28 22:42:59 UTC (rev 154405)
@@ -1,12 +0,0 @@
-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 {

Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch (from rev 154404, trunk/dports/www/webkit2-gtk-devel/files/PR-163340.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163340.patch	2016-10-28 22:42:59 UTC (rev 154405)
@@ -0,0 +1,29 @@
+From 6cb629514378ea9439617081febb4aa1ec9fa35f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 12 Oct 2016 10:06:47 -0700
+Subject: [PATCH] Fix a build failure with clang due to std::function usage
+ without #include <functional>
+
+https://bugs.webkit.org/show_bug.cgi?id=163340
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ Source/WebCore/ChangeLog                                  | 9 +++++++++
+ Source/WebCore/platform/network/soup/SoupNetworkSession.h | 1 +
+ 2 files changed, 10 insertions(+)
+
+diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h
+index 9f1c183..0132cb4 100644
+--- Source/WebCore/platform/network/soup/SoupNetworkSession.h
++++ Source/WebCore/platform/network/soup/SoupNetworkSession.h
+@@ -26,6 +26,7 @@
+ #ifndef SoupNetworkSession_h
+ #define SoupNetworkSession_h
+ 
++#include <functional>
+ #include <wtf/Noncopyable.h>
+ #include <wtf/Vector.h>
+ #include <wtf/glib/GRefPtr.h>
+-- 
+2.10.1
+

Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch (from rev 154404, trunk/dports/www/webkit2-gtk-devel/files/PR-163346.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk-devel/files/PR-163346.patch	2016-10-28 22:42:59 UTC (rev 154405)
@@ -0,0 +1,35 @@
+Index: Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp
+===================================================================
+--- Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp	(revision 207243)
++++ Source/WebKit2/UIProcess/API/C/WKTextChecker.cpp	(working copy)
+@@ -27,7 +27,7 @@
+ #include "WKTextChecker.h"
+ #include "TextChecker.h"
+ 
+-#if !defined(__APPLE__)
++#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
+ #include "WKAPICast.h"
+ #include "WebPageProxy.h"
+ #include "WebTextChecker.h"
+@@ -40,7 +40,7 @@ void WKTextCheckerSetTestingMode(bool en
+     TextChecker::setTestingMode(enabled);
+ }
+ 
+-#if !defined(__APPLE__)
++#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
+ 
+ void WKTextCheckerSetClient(const WKTextCheckerClientBase* wkClient)
+ {
+Index: Source/WebKit2/UIProcess/API/C/WKTextChecker.h
+===================================================================
+--- Source/WebKit2/UIProcess/API/C/WKTextChecker.h	(revision 207243)
++++ Source/WebKit2/UIProcess/API/C/WKTextChecker.h	(working copy)
+@@ -34,7 +34,7 @@ extern "C" {
+ 
+ WK_EXPORT void WKTextCheckerSetTestingMode(bool enabled);
+ 
+-#if !defined(__APPLE__)
++#if defined(BUILDING_EFL__) || defined(BUILDING_GTK__) || !defined(__APPLE__)
+ 
+ // TextChecker Client
+ typedef bool (*WKTextCheckerContinousSpellCheckingAllowed)(const void *clientInfo);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161029/0a68a256/attachment-0002.html>

More information about the macports-changes mailing list