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

2016-09-22 Thread 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
===
--- PKGBUILD2016-09-21 21:37:12 UTC (rev 276817)
+++ PKGBUILD2016-09-22 07:54:03 UTC (rev 276818)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger 
 
 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.0 +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:


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

2016-03-13 Thread Jan Steffens
Date: Sunday, March 13, 2016 @ 15:40:54
  Author: heftig
Revision: 261409

2.10.8

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

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

Modified: PKGBUILD
===
--- PKGBUILD2016-03-13 14:12:09 UTC (rev 261408)
+++ PKGBUILD2016-03-13 14:40:54 UTC (rev 261409)
@@ -2,13 +2,13 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=webkit2gtk
-pkgver=2.10.7
+pkgver=2.10.8
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/";
 license=('custom')
-depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs'
+depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs' 
'gst-plugins-bad'
 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3' 'libnotify' 'hyphen')
 makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 
'python')
 optdepends=('gtk2: Netscape plugin support'
@@ -16,13 +16,15 @@
 'gst-plugins-good: media decoding'
 'gst-libav: nonfree media decoding')
 options=('!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz)
-sha256sums=('990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e')
+source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz isnan.patch)
+sha256sums=('313682b23f03c457b28a7ef2d5bdb70a8174cca1d32e0a853fb36fa4dcf928a9'
+'958732bcf77befc534af25e26b57772a42b77b99d88a4904484e7c3f943b0a0e')
 
 prepare() {
   mkdir build
 
   cd webkitgtk-$pkgver
+  patch -Np1 -i ../isnan.patch
   sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
   rm -r Source/ThirdParty/gtest/
   rm -r Source/ThirdParty/qunit/

Added: isnan.patch
===
--- isnan.patch (rev 0)
+++ isnan.patch 2016-03-13 14:40:54 UTC (rev 261409)
@@ -0,0 +1,12 @@
+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.0 +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: