Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7629 from Rmys/master

Browse Source 
qst*:ver. bump
This commit is contained in:
Rmys
2020-01-19 18:53:37 +03:00
committed by GitHub
parent 2f73669863 e3c1753bcf
commit 67f7a8f976
11 changed files with 116 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webkit/files/icu65.patch
+37
View File
@@ -0,0 +1,37 @@
From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@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@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;
desktop/toolkit/qt5/qt5-webkit/pspec.xml
+2 -2
View File
@@ -59,7 +59,7 @@
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtwebkit-10-06-2019.patch</Patch> -->
<Patch level="1">icu65.patch</Patch>
<!-- <Patch level="1">qt5-webkit-cmake3.10.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-gcc7.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> -->
@@ -136,7 +136,7 @@
<History>
<Update release="19">
<Date>2019-12-22</Date>
<Date>2020-01-19</Date>
<Version>5.212.0</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>