From 3dd6d54cc4b1242b56ba938a69dbc306701c87a1f51b400c586e90cc44517d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 22 Jan 2020 17:12:26 +0000 Subject: [PATCH] Accepting request 766279 from GNOME:Next - Update to version 2.26.3: + Fix issues while trying to play a video on NextCloud. + Make sure the GL video sink uses a valid WebKit shared GL context. + Fix vertical alignment of text containing arabic diacritics. + Fix build with icu 65.1. + Fix page loading errors with websites using HSTS. + Fix web process crash when displaying a KaTeX formula. + Fix several crashes and rendering issues. - Drop webkit2gtk3-icu-build-fix.patch: Fixed upstream. - Start using webkitgtk default gigacage malloc via passing USE_SYSTEM_MALLOC=OFF to cmake. OBS-URL: https://build.opensuse.org/request/show/766279 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=242 --- webkit2gtk3-icu-build-fix.patch | 73 --------------------------------- webkit2gtk3.changes | 20 +++++++++ webkit2gtk3.spec | 13 +++--- webkitgtk-2.26.2.tar.xz | 3 -- webkitgtk-2.26.2.tar.xz.asc | 6 --- webkitgtk-2.26.3.tar.xz | 3 ++ webkitgtk-2.26.3.tar.xz.asc | 6 +++ 7 files changed, 34 insertions(+), 90 deletions(-) delete mode 100644 webkit2gtk3-icu-build-fix.patch delete mode 100644 webkitgtk-2.26.2.tar.xz delete mode 100644 webkitgtk-2.26.2.tar.xz.asc create mode 100644 webkitgtk-2.26.3.tar.xz create mode 100644 webkitgtk-2.26.3.tar.xz.asc diff --git a/webkit2gtk3-icu-build-fix.patch b/webkit2gtk3-icu-build-fix.patch deleted file mode 100644 index a07c589..0000000 --- a/webkit2gtk3-icu-build-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 730b80e691a4b9dd0e9727cfcd9806dfa542397b Mon Sep 17 00:00:00 2001 -From: "commit-queue@webkit.org" - -Date: Fri, 4 Oct 2019 21:51:37 +0000 -Subject: [PATCH] Fix build with icu 65.1 - https://bugs.webkit.org/show_bug.cgi?id=202600 - -Patch by Heiko Becker on 2019-10-04 -Reviewed by Konstantin Tokarev. - -Source/WebCore: - -* dom/Document.cpp: -(WebCore::isValidNameNonASCII): -(WebCore::Document::parseQualifiedName): - -Source/WTF: - -* wtf/URLHelpers.cpp: -(WTF::URLHelpers::allCharactersInIDNScriptWhiteList): - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WTF/ChangeLog | 10 ++++++++++ - Source/WTF/wtf/URLHelpers.cpp | 2 +- - Source/WebCore/ChangeLog | 11 +++++++++++ - Source/WebCore/dom/Document.cpp | 6 +++--- - 4 files changed, 25 insertions(+), 4 deletions(-) - -diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp -index 18e7f13cd61..c584f1a0cb7 100644 ---- a/Source/WTF/wtf/URLHelpers.cpp -+++ b/Source/WTF/wtf/URLHelpers.cpp -@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt - Optional 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) { -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index 2443e24c9bc..1fbb3a71600 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -4954,12 +4954,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; - } -@@ -5019,7 +5019,7 @@ ExceptionOr> Document::parseQualifiedName(cons - - 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 }; --- -2.23.0 - diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 0a36249..89bbd34 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 22 11:44:30 UTC 2020 - Bjørn Lie + +- Update to version 2.26.3: + + Fix issues while trying to play a video on NextCloud. + + Make sure the GL video sink uses a valid WebKit shared GL + context. + + Fix vertical alignment of text containing arabic diacritics. + + Fix build with icu 65.1. + + Fix page loading errors with websites using HSTS. + + Fix web process crash when displaying a KaTeX formula. + + Fix several crashes and rendering issues. +- Drop webkit2gtk3-icu-build-fix.patch: Fixed upstream. + +------------------------------------------------------------------- +Thu Dec 19 21:50:10 UTC 2019 - Bjørn Lie + +- Start using webkitgtk default gigacage malloc via passing + USE_SYSTEM_MALLOC=OFF to cmake. + ------------------------------------------------------------------- Thu Dec 19 15:36:37 UTC 2019 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index aeeb35b..241f016 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,7 +1,7 @@ # # spec file for package webkit2gtk3 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ %define _gold_linker 0 %endif Name: webkit2gtk3 -Version: 2.26.2 +Version: 2.26.3 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0-or-later AND BSD-3-Clause @@ -43,10 +43,8 @@ Source98: baselibs.conf Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE webkit2gtk3-fdo-soname.patch mgorse@suse.com -- don't call dlopen with an unversioned soname. Patch0: webkit2gtk3-fdo-soname.patch -# PATCh-FIX-UPSTREAM webkit2gtk3-icu-build-fix.patch mgorse@suse.com -- fix build with icu 65.1. -Patch1: webkit2gtk3-icu-build-fix.patch # PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary. -Patch2: webkit-process.patch +Patch1: webkit-process.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel @@ -274,9 +272,8 @@ A small test browswer from webkit, useful for testing features. %prep %setup -n webkitgtk-%{version} %patch0 -p1 -%patch1 -p1 %if 0%{?suse_version} <= 1500 -%patch2 -p1 +%patch1 -p1 %endif %build @@ -324,7 +321,7 @@ export PYTHON=%{_bindir}/python3 %ifarch armv6hl ppc ppc64 ppc64le riscv64 s390 s390x -DENABLE_JIT=OFF \ %endif - -DUSE_SYSTEM_MALLOC=ON \ + -DUSE_SYSTEM_MALLOC=OFF \ %ninja_build -j $max_link_jobs diff --git a/webkitgtk-2.26.2.tar.xz b/webkitgtk-2.26.2.tar.xz deleted file mode 100644 index ba26624..0000000 --- a/webkitgtk-2.26.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 -size 19330000 diff --git a/webkitgtk-2.26.2.tar.xz.asc b/webkitgtk-2.26.2.tar.xz.asc deleted file mode 100644 index d299ef5..0000000 --- a/webkitgtk-2.26.2.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXcKSKgAKCRDz0yLQ7EWC -w5ZmAKDqbtkT6DEgGRxO8a9mJQKSwHfG3ACfUDAPsDrB5jlNb1dU4GrmF/Oysg8= -=3Tah ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.26.3.tar.xz b/webkitgtk-2.26.3.tar.xz new file mode 100644 index 0000000..290975d --- /dev/null +++ b/webkitgtk-2.26.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:add51153943cc11d90a7038d0ea5f6332281e6c0be0640f802a211b035f0e611 +size 19331900 diff --git a/webkitgtk-2.26.3.tar.xz.asc b/webkitgtk-2.26.3.tar.xz.asc new file mode 100644 index 0000000..abc03bf --- /dev/null +++ b/webkitgtk-2.26.3.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXigwhQAKCRDz0yLQ7EWC +wz8KAKCvU8asv5ri4dRNugTDCVxvSQOvjwCeMoFxISxWXV4Wgf2Y1BRFr0bktUs= +=j3rL +-----END PGP SIGNATURE-----