From 521db43daea5d596be8bda40ab946deeecf4b0bc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Tue, 29 Sep 2015 00:39:45 +0200
Subject: [PATCH] webkit2gtk: update to 2.10.0.

---
 .../webkit2gtk/patches/musl-execinfo.patch    | 15 ++++---
 srcpkgs/webkit2gtk/patches/musl-isnan.patch   | 39 -------------------
 srcpkgs/webkit2gtk/template                   |  9 +++--
 3 files changed, 12 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/webkit2gtk/patches/musl-isnan.patch

diff --git a/srcpkgs/webkit2gtk/patches/musl-execinfo.patch b/srcpkgs/webkit2gtk/patches/musl-execinfo.patch
index fbd4472d0c4..644cd82f779 100644
--- a/srcpkgs/webkit2gtk/patches/musl-execinfo.patch
+++ b/srcpkgs/webkit2gtk/patches/musl-execinfo.patch
@@ -24,15 +24,14 @@ __GLIBC__ is not defined.
  #elif OS(WINDOWS)
      // The CaptureStackBackTrace function is available in XP, but it is not defined
 index 657ced4..ceb9c47 100644
---- Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
-+++ Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
-@@ -46,7 +46,9 @@
+--- Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp.orig  2015-09-24 08:04:57.685969077 +0200
++++ Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp       2015-09-24 08:05:25.307830938 +0200
+@@ -46,7 +46,7 @@
+ #include <wtf/Stopwatch.h>
  
  #include <cxxabi.h>
+-#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
++#if OS(DARWIN) || (defined(__GLIBC__) && !PLATFORM(GTK))
  #include <dlfcn.h>
-+#if defined(__GLIBC__)
  #include <execinfo.h>
-+#endif
- 
- #if ENABLE(REMOTE_INSPECTOR)
- #include "JSGlobalObjectDebuggable.h"
+ #endif
diff --git a/srcpkgs/webkit2gtk/patches/musl-isnan.patch b/srcpkgs/webkit2gtk/patches/musl-isnan.patch
deleted file mode 100644
index 7d66bc76c43..00000000000
--- a/srcpkgs/webkit2gtk/patches/musl-isnan.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Explicitly use std::isnan() for musl libc
-
---- Source/WTF/wtf/Stopwatch.h
-+++ Source/WTF/wtf/Stopwatch.h
-@@ -44,7 +44,7 @@
- 
-     double elapsedTime();
- 
--    bool isActive() const { return !isnan(m_lastStartTime); }
-+    bool isActive() const { return !std::isnan(m_lastStartTime); }
- private:
-     Stopwatch() { reset(); }
- 
-@@ -60,14 +60,14 @@
- 
- inline void Stopwatch::start()
- {
--    ASSERT_WITH_MESSAGE(isnan(m_lastStartTime), "Tried to start the stopwatch, but it is already running.");
-+    ASSERT_WITH_MESSAGE(std::isnan(m_lastStartTime), "Tried to start the stopwatch, but it is already running.");
- 
-     m_lastStartTime = monotonicallyIncreasingTime();
- }
- 
- inline void Stopwatch::stop()
- {
--    ASSERT_WITH_MESSAGE(!isnan(m_lastStartTime), "Tried to stop the stopwatch, but it is not running.");
-+    ASSERT_WITH_MESSAGE(!std::isnan(m_lastStartTime), "Tried to stop the stopwatch, but it is not running.");
- 
-     m_elapsedTime += monotonicallyIncreasingTime() - m_lastStartTime;
-     m_lastStartTime = NAN;
-@@ -75,7 +75,7 @@
- 
- inline double Stopwatch::elapsedTime()
- {
--    bool shouldSuspend = !isnan(m_lastStartTime);
-+    bool shouldSuspend = !std::isnan(m_lastStartTime);
-     if (shouldSuspend)
-         stop();
- 
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 47e4177d511..8af01905888 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
-version=2.8.5
-revision=3
+version=2.10.0
+revision=1
 build_style=cmake
 configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc"
 short_desc="GTK+3 port of the WebKit2 browser engine"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="http://webkitgtk.org/"
 license="LGPL-2.1, 2-clause-BSD"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20
+checksum=42325622ef35394fa65a139b55f0a20b843bbd6f8b94cb7c591da6d68c62686d
 wrksrc="webkitgtk-$version"
 
 # ETOOHUGE
@@ -21,7 +21,8 @@ makedepends="
  at-spi2-core-devel libjpeg-turbo-devel libpng-devel sqlite-devel
  harfbuzz-devel gst-plugins-base1-devel libsoup-devel libxslt-devel
  icu55-devel enchant-devel dbus-glib-devel libwebp-devel
- gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel geoclue2"
+ gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel geoclue2
+ libnotify-devel hyphen-devel"
 
 # Package build options
 build_options="gir wayland x11"