[arch-commits] Commit in webkit2gtk/repos (3 files)

[Felix Yan]

    Date: Monday, November 11, 2019 @ 23:26:58
  Author: felixonmars
Revision: 367808

archrelease: copy trunk to staging-x86_64

Added:
  webkit2gtk/repos/staging-x86_64/
  webkit2gtk/repos/staging-x86_64/PKGBUILD
    (from rev 367807, webkit2gtk/trunk/PKGBUILD)
  webkit2gtk/repos/staging-x86_64/icu65.patch
    (from rev 367807, webkit2gtk/trunk/icu65.patch)

-------------+
 PKGBUILD    |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 icu65.patch |   39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

Copied: webkit2gtk/repos/staging-x86_64/PKGBUILD (from rev 367807, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2019-11-11 23:26:58 UTC (rev 367808)
@@ -0,0 +1,61 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.26.2
+pkgrel=2
+pkgdesc="GTK+ Web content engine library"
+arch=(x86_64)
+url="https://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt enchant gst-plugins-base-libs libsecret libwebp openjpeg2
+         harfbuzz-icu gtk3 libnotify hyphen woff2 libwpe wpebackend-fdo
+         bubblewrap xdg-dbus-proxy)
+makedepends=(gperf gobject-introspection ruby gtk-doc cmake python geoclue)
+optdepends=('geoclue: Geolocation support'
+            'gst-plugins-good: media decoding'
+            'gst-plugins-bad: media decoding'
+            'gst-libav: nonfree media decoding')
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
+        icu65.patch)
+sha256sums=('6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512'
+            'SKIP'
+            '3acd85fecfca223e3fbf834e3be286ea29270689da994a758659abc8ed0a6635')
+validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'
+              '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B')
+
+prepare() {
+  cd webkitgtk-$pkgver
+  patch -Np1 -i ../icu65.patch # from PLD Linux
+}
+
+build() {
+  cmake -Hwebkitgtk-$pkgver -Bbuild \
+    -DPORT=GTK \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DENABLE_GTKDOC=ON \
+    -DLIBEXEC_INSTALL_DIR=/usr/lib \
+    -DLIB_INSTALL_DIR=/usr/lib
+  cmake --build build
+}
+
+check() {
+  : cmake --build build --target tests
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+
+  cd webkitgtk-$pkgver
+  find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z |
+    while IFS= read -d $'\0' -r _f; do
+      echo "### $_f ###"
+      cat "$_f"
+      echo
+    done |
+    install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set sw=2 et:

Copied: webkit2gtk/repos/staging-x86_64/icu65.patch (from rev 367807, webkit2gtk/trunk/icu65.patch)
===================================================================
--- staging-x86_64/icu65.patch	                        (rev 0)
+++ staging-x86_64/icu65.patch	2019-11-11 23:26:58 UTC (rev 367808)
@@ -0,0 +1,39 @@
+diff -urN webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp
+--- webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp	2019-09-02 11:41:47.000000000 +0200
++++ webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp	2019-10-08 16:24:57.649551493 +0200
+@@ -4944,12 +4944,12 @@
+     unsigned i = 0;
+ 
+     UChar32 c;
+-    U16_NEXT(characters, i, length, c)
++    U16_NEXT(characters, i, length, c);
+     if (!isValidNameStart(c))
+         return false;
+ 
+     while (i < length) {
+-        U16_NEXT(characters, i, length, c)
++        U16_NEXT(characters, i, length, c);
+         if (!isValidNamePart(c))
+             return false;
+     }
+@@ -5009,7 +5009,7 @@
+ 
+     for (unsigned i = 0; i < length; ) {
+         UChar32 c;
+-        U16_NEXT(qualifiedName, i, length, c)
++        U16_NEXT(qualifiedName, i, length, c);
+         if (c == ':') {
+             if (sawColon)
+                 return Exception { InvalidCharacterError };
+diff -urN webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp
+--- webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp	2019-08-28 13:46:29.000000000 +0200
++++ webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp	2019-10-08 16:24:50.619850993 +0200
+@@ -301,7 +301,7 @@
+     Optional<UChar32> previousCodePoint;
+     while (i < length) {
+         UChar32 c;
+-        U16_NEXT(buffer, i, length, c)
++        U16_NEXT(buffer, i, length, c);
+         UErrorCode error = U_ZERO_ERROR;
+         UScriptCode script = uscript_getScript(c, &error);
+         if (error != U_ZERO_ERROR) {