[arch-commits] Commit in webkit2gtk/trunk (PKGBUILD isnan.patch)

[Jan de Groot]

    Date: Thursday, September 22, 2016 @ 07:54:03
  Author: jgc
Revision: 276818

upgpkg: webkit2gtk 2.14.0-1

Modified:
  webkit2gtk/trunk/PKGBUILD
Deleted:
  webkit2gtk/trunk/isnan.patch

-------------+
 PKGBUILD    |    8 ++++----
 isnan.patch |   12 ------------
 2 files changed, 4 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-21 21:37:12 UTC (rev 276817)
+++ PKGBUILD	2016-09-22 07:54:03 UTC (rev 276818)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=webkit2gtk
-pkgver=2.12.5
+pkgver=2.14.0
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@
 license=('custom')
 depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs'
 	 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3' 'libnotify' 'hyphen')
-makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python')
+makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python' 'python2')
 optdepends=('gtk2: Netscape plugin support'
             'gst-plugins-base: free media decoding'
             'gst-plugins-good: media decoding'
@@ -19,7 +19,7 @@
 
 # webkitgtk's signature scheme (sha1-file-as-pgp-message) is bananas and not supported
 source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz)
-sha1sums=('2d73fd5b47c68c73aea8b3d7b88acc8e62bdb99c')
+sha1sums=('cc3419a369a3a41edd57a395373f71bbdfcfcaaf')
 
 prepare() {
   mkdir build
@@ -35,7 +35,7 @@
   cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \
         -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
-        -DENABLE_GTKDOC=ON ../webkitgtk-$pkgver
+        -DENABLE_GTKDOC=ON -DPYTHON_EXECUTABLE=/usr/bin/python2 ../webkitgtk-$pkgver
   make
 }
 

Deleted: isnan.patch
===================================================================
--- isnan.patch	2016-09-21 21:37:12 UTC (rev 276817)
+++ isnan.patch	2016-09-22 07:54:03 UTC (rev 276818)
@@ -1,12 +0,0 @@
-diff -u -r webkitgtk-2.10.8/Source/JavaScriptCore/runtime/Options.cpp webkitgtk-2.10.8-isnan/Source/JavaScriptCore/runtime/Options.cpp
---- webkitgtk-2.10.8/Source/JavaScriptCore/runtime/Options.cpp	2016-03-11 09:59:07.000000000 +0100
-+++ webkitgtk-2.10.8-isnan/Source/JavaScriptCore/runtime/Options.cpp	2016-03-13 13:51:55.114836547 +0100
-@@ -610,7 +610,7 @@
-     case Options::Type::unsignedType:
-         return m_entry.unsignedVal == other.m_entry.unsignedVal;
-     case Options::Type::doubleType:
--        return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
-+        return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
-     case Options::Type::int32Type:
-         return m_entry.int32Val == other.m_entry.int32Val;
-     case Options::Type::optionRangeType: