From 434db42f4a7dbe2489c58e1572754b0b7f2c9df0 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 30 Oct 2017 10:31:15 +0100 Subject: nonprism/webkit2gtk: updated to 2.18.2 --- nonprism/webkit2gtk/PKGBUILD | 46 +++++++++++++++++++---------------------- nonprism/webkit2gtk/icu59.patch | 42 ------------------------------------- nonprism/webkit2gtk/isnan.patch | 12 ----------- 3 files changed, 21 insertions(+), 79 deletions(-) delete mode 100644 nonprism/webkit2gtk/icu59.patch delete mode 100644 nonprism/webkit2gtk/isnan.patch diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD index 3fde482cf..b51b86fbf 100644 --- a/nonprism/webkit2gtk/PKGBUILD +++ b/nonprism/webkit2gtk/PKGBUILD @@ -1,64 +1,60 @@ -# Maintainer: Jesús E. +# Maintainer: Andreas Grapentin # Contributor (Arch): Eric Bélanger +# Contributor: Jesús E. # Contributor: André Silva # Contributor: Luke R. pkgname=webkit2gtk -pkgver=2.17.3 -pkgrel=2.nonprism1 +pkgver=2.18.2 +pkgrel=1.nonprism1 pkgdesc="GTK+ Web content engine library, without geoclue2 support" -arch=(i686 x86_64) +arch=(i686 x86_64 armv7h) url="https://webkitgtk.org/" license=(custom) -depends=(libxt libxslt enchant libsoup gst-plugins-base-libs +depends=(libxt libxslt enchant libsoup gst-plugins-base-libs gst-plugins-bad libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen) -makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2) +makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2 ninja) optdepends=('gtk2: Netscape plugin support' 'gst-plugins-base: free media decoding' 'gst-plugins-good: media decoding' 'gst-libav: nonfree media decoding') options=(!emptydirs) -source=("https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz"{,.asc} - 'icu59.patch') -sha256sums=('79f168c30953dbd273f984d3cc85482169e6822fcf7cf0031c86cf8aa1816b35' - 'SKIP' - '249de46d5b665e57f0ba245197bda7da6383bdfb597020aba3cdedbe36eadd21') +source=("https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz"{,.asc}) +sha256sums=('b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7' + 'SKIP') validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3') 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/ - #patch -Np1 -i ../isnan.patch Unnecessary already fixed. - patch -Np1 -i ../icu59.patch } build() { cd build - cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ + cmake -G Ninja -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 \ -DUSE_GEOCLUE2=OFF -DENABLE_GEOLOCATION=OFF \ -DENABLE_GTKDOC=ON -DPYTHON_EXECUTABLE=/usr/bin/python2 ../webkitgtk-$pkgver + if [[ "$CARCH" =~ ^arm*|^aarch64$ ]]; then # strip -O3 from cmake generated makefiles find ./ -type f -exec sed -i -e 's/-O3//g' {} \; fi - make + + ninja } package() { cd build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja 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 + cd ../webkitgtk-$pkgver/Source + while IFS= read -d $'\0' -r _f; do + echo "### $_f ###"; cat "$_f"; echo + done < <(find . -name 'COPYING*' -or -name 'LICENSE*' -print0) \ + | install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/nonprism/webkit2gtk/icu59.patch b/nonprism/webkit2gtk/icu59.patch deleted file mode 100644 index 0b7a2354f..000000000 --- a/nonprism/webkit2gtk/icu59.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Source/JavaScriptCore/API/JSStringRef.h b/Source/JavaScriptCore/API/JSStringRef.h -index bc03ed7..3e51af8 100644 ---- a/Source/JavaScriptCore/API/JSStringRef.h -+++ b/Source/JavaScriptCore/API/JSStringRef.h -@@ -32,6 +32,7 @@ - #include - #endif - #include /* for size_t */ -+#include - - #ifdef __cplusplus - extern "C" { -@@ -46,7 +47,7 @@ extern "C" { - character. As with all scalar types, endianness depends on the underlying - architecture. - */ -- typedef unsigned short JSChar; -+ typedef char16_t JSChar; - #else - typedef wchar_t JSChar; - #endif -diff --git a/Source/WebKit2/Shared/API/c/WKString.h b/Source/WebKit2/Shared/API/c/WKString.h -index 4c6a204..a8f5647 100644 ---- a/Source/WebKit2/Shared/API/c/WKString.h -+++ b/Source/WebKit2/Shared/API/c/WKString.h -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - #ifndef __cplusplus - #include -@@ -39,7 +40,7 @@ extern "C" { - - #if !defined(WIN32) && !defined(_WIN32) \ - && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ -- typedef unsigned short WKChar; -+ typedef char16_t WKChar; - #else - typedef wchar_t WKChar; - #endif diff --git a/nonprism/webkit2gtk/isnan.patch b/nonprism/webkit2gtk/isnan.patch deleted file mode 100644 index cafa89a0d..000000000 --- a/nonprism/webkit2gtk/isnan.patch +++ /dev/null @@ -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: -- cgit v1.2.3