Date: Sunday, March 13, 2016 @ 15:51:04 Author: heftig Revision: 261410
archrelease: copy trunk to extra-i686, extra-x86_64 Added: webkit2gtk/repos/extra-i686/PKGBUILD (from rev 261409, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/extra-i686/isnan.patch (from rev 261409, webkit2gtk/trunk/isnan.patch) webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 261409, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/extra-x86_64/isnan.patch (from rev 261409, webkit2gtk/trunk/isnan.patch) Deleted: webkit2gtk/repos/extra-i686/PKGBUILD webkit2gtk/repos/extra-x86_64/PKGBUILD --------------------------+ /PKGBUILD | 106 +++++++++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 51 --------------------- extra-i686/isnan.patch | 12 +++++ extra-x86_64/PKGBUILD | 51 --------------------- extra-x86_64/isnan.patch | 12 +++++ 5 files changed, 130 insertions(+), 102 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-03-13 14:40:54 UTC (rev 261409) +++ extra-i686/PKGBUILD 2016-03-13 14:51:04 UTC (rev 261410) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.10.7 -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' - 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3' 'libnotify' 'hyphen') -makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python') -optdepends=('gtk2: Netscape plugin support' - 'gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=('!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz) -sha256sums=('990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e') - -prepare() { - mkdir build - - cd webkitgtk-$pkgver - sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc - rm -r Source/ThirdParty/gtest/ - rm -r Source/ThirdParty/qunit/ -} - -build() { - cd build - 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 - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" - cd "$srcdir/webkitgtk-$pkgver/Source" - for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do - echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - done -} Copied: webkit2gtk/repos/extra-i686/PKGBUILD (from rev 261409, webkit2gtk/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-03-13 14:51:04 UTC (rev 261410) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +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' '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' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=('!emptydirs') +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/ +} + +build() { + cd build + 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 + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" + cd "$srcdir/webkitgtk-$pkgver/Source" + for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do + echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + done +} Copied: webkit2gtk/repos/extra-i686/isnan.patch (from rev 261409, webkit2gtk/trunk/isnan.patch) =================================================================== --- extra-i686/isnan.patch (rev 0) +++ extra-i686/isnan.patch 2016-03-13 14:51:04 UTC (rev 261410) @@ -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.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: Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-03-13 14:40:54 UTC (rev 261409) +++ extra-x86_64/PKGBUILD 2016-03-13 14:51:04 UTC (rev 261410) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.10.7 -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' - 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3' 'libnotify' 'hyphen') -makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python') -optdepends=('gtk2: Netscape plugin support' - 'gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=('!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz) -sha256sums=('990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e') - -prepare() { - mkdir build - - cd webkitgtk-$pkgver - sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc - rm -r Source/ThirdParty/gtest/ - rm -r Source/ThirdParty/qunit/ -} - -build() { - cd build - 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 - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" - cd "$srcdir/webkitgtk-$pkgver/Source" - for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do - echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - done -} Copied: webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 261409, webkit2gtk/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-03-13 14:51:04 UTC (rev 261410) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +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' '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' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=('!emptydirs') +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/ +} + +build() { + cd build + 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 + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" + cd "$srcdir/webkitgtk-$pkgver/Source" + for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do + echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + done +} Copied: webkit2gtk/repos/extra-x86_64/isnan.patch (from rev 261409, webkit2gtk/trunk/isnan.patch) =================================================================== --- extra-x86_64/isnan.patch (rev 0) +++ extra-x86_64/isnan.patch 2016-03-13 14:51:04 UTC (rev 261410) @@ -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.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: