[arch-commits] Commit in qt5-webkit/repos/extra-x86_64 (PKGBUILD PKGBUILD icu65.patch)

[Antonio Rojas]

    Date: Tuesday, March 10, 2020 @ 07:20:29
  Author: arojas
Revision: 377254

archrelease: copy trunk to extra-x86_64

Added:
  qt5-webkit/repos/extra-x86_64/PKGBUILD
    (from rev 377253, qt5-webkit/trunk/PKGBUILD)
Deleted:
  qt5-webkit/repos/extra-x86_64/PKGBUILD
  qt5-webkit/repos/extra-x86_64/icu65.patch

-------------+
 PKGBUILD    |   83 +++++++++++++++++++++++++++-------------------------------
 icu65.patch |   37 -------------------------
 2 files changed, 40 insertions(+), 80 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-10 07:20:03 UTC (rev 377253)
+++ PKGBUILD	2020-03-10 07:20:29 UTC (rev 377254)
@@ -1,43 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-webkit
-_pkgver=5.212.0-alpha3
-pkgver=${_pkgver/-/}
-pkgrel=9
-arch=(x86_64)
-url='https://www.qt.io'
-license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz"
-        icu65.patch)
-depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
-makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
-optdepends=('gst-plugins-good: Webm codec support')
-sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17'
-            '2c806634ba208696a6cee4de72deefb289dd623378fddf92b09a36e3a99382fd')
-
-prepare() {
-  mkdir -p build
-  patch -Np1 -d qtwebkit-$_pkgver <icu65.patch
-}
-
-build() {
-  cd build
-
-  cmake ../qtwebkit-$_pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
-    -DPORT=Qt \
-    -DENABLE_TOOLS=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}

Copied: qt5-webkit/repos/extra-x86_64/PKGBUILD (from rev 377253, qt5-webkit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-10 07:20:29 UTC (rev 377254)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-webkit
+_pkgver=5.212.0-alpha4
+pkgver=${_pkgver/-/}
+pkgrel=1
+arch=(x86_64)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
+source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz")
+depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
+makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
+optdepends=('gst-plugins-good: Webm codec support')
+sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+
+  cmake ../qtwebkit-$_pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
+    -DPORT=Qt \
+    -DENABLE_TOOLS=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}

Deleted: icu65.patch
===================================================================
--- icu65.patch	2020-03-10 07:20:03 UTC (rev 377253)
+++ icu65.patch	2020-03-10 07:20:29 UTC (rev 377254)
@@ -1,37 +0,0 @@
-From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen at yandex.ru>
-Date: Tue, 8 Oct 2019 01:20:22 +0300
-Subject: [PATCH] Import QtWebKit commit
- 5e53102492e5ce85bda2657468f1369a0173c2ce
-
-Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628
-Reviewed-by: Konstantin Tokarev <annulen at yandex.ru>
-
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 1bca2d0a66f..19355f16601 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     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;
-     }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
- 
-     for (unsigned i = 0; i < length;) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon) {
-                 ec = NAMESPACE_ERR;