From: rmccask <rmccask@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] qt5-webkit: new snapshot; fix for upcoming icu-67.1
Date: Tue, 12 May 2020 14:17:35 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21878@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
There is a new pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages qt5-webkit-5.212.0
https://github.com/void-linux/void-packages/pull/21878
qt5-webkit: new snapshot; fix for upcoming icu-67.1
A patch file from https://github.com/void-linux/void-packages/pull/21878.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5-webkit-5.212.0-21878.patch --]
[-- Type: text/x-diff, Size: 3948 bytes --]
From a16f618a0c649fb64006e3db938edd7f1006ffe2 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Tue, 12 May 2020 08:13:21 -0400
Subject: [PATCH] qt5-webkit: new snapshot; fix for upcoming icu-67.1
---
srcpkgs/qt5-webkit/patches/armv6l-asm.patch | 23 ------------
srcpkgs/qt5-webkit/patches/icu.patch | 40 +++++++++++++++++++++
srcpkgs/qt5-webkit/template | 4 +--
3 files changed, 42 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qt5-webkit/patches/armv6l-asm.patch
create mode 100644 srcpkgs/qt5-webkit/patches/icu.patch
diff --git a/srcpkgs/qt5-webkit/patches/armv6l-asm.patch b/srcpkgs/qt5-webkit/patches/armv6l-asm.patch
deleted file mode 100644
index 284929f035d..00000000000
--- a/srcpkgs/qt5-webkit/patches/armv6l-asm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix code emitted for armv6l to not use movw/movt but ldr.
-See https://bugs.webkit.org/show_bug.cgi?id=131612
-and https://bugs.webkit.org/show_bug.cgi?id=141288
-
---- Source/JavaScriptCore/offlineasm/arm.rb 2015-07-22 14:37:57.000000000 +0200
-+++ Source/JavaScriptCore/offlineasm/arm.rb 2015-08-08 00:31:21.011824644 +0200
-@@ -473,8 +473,16 @@
- $asm.puts "mov #{armFlippedOperands(operands)}"
- end
- when "mvlbl"
-+ if isARMv7 or isARMv7Traditional
- $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
- $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
-+ else
-+ $mvlbl_counter ||= 0
-+ $mvlbl_counter += 1
-+ const_label = "_mvlbl_const_label#{$mvlbl_counter}"
-+ $asm.puts ".equ #{const_label}, (#{operands[0].value})"
-+ $asm.puts "ldr #{operands[1].armOperand}, =#{const_label}"
-+ end
- when "nop"
- $asm.puts "nop"
- when "bieq", "bpeq", "bbeq"
diff --git a/srcpkgs/qt5-webkit/patches/icu.patch b/srcpkgs/qt5-webkit/patches/icu.patch
new file mode 100644
index 00000000000..1fc3b256101
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu.patch
@@ -0,0 +1,40 @@
+From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 4 Oct 2019 22:17:11 +0200
+Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
+
+---
+ Source/WebCore/dom/Document.cpp | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git Source/WebCore/dom/Document.cpp Source/WebCore/dom/Document.cpp
+index 0fd0fa090bf..01f76850f3d 100644
+--- Source/WebCore/dom/Document.cpp
++++ 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<std::pair<AtomString, AtomString>> 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/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 4a4d0282dad..e86fbb8e483 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,8 +1,8 @@
# Template file for 'qt5-webkit'
pkgname=qt5-webkit
version=5.212.0
-revision=7
-_snap=1565895469
+revision=8
+_snap=1586819898
_v=${version%.*}
wrksrc="qtwebkit-everywhere-src-${_v}"
build_style=cmake
next reply other threads:[~2020-05-12 12:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 12:17 rmccask [this message]
2020-05-12 21:15 ` [PR PATCH] [Updated] " rmccask
2020-05-13 3:35 ` rmccask
2020-05-13 3:38 ` rmccask
2020-05-13 21:06 ` [PR PATCH] [Updated] qt5-webkit: new snapshot rmccask
2020-05-13 22:21 ` rmccask
2020-05-26 20:23 ` qt5-webkit: new snapshot; ARMv6 patch q66
2020-05-26 20:28 ` [PR PATCH] [Closed]: " q66
2020-05-26 20:28 ` q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21878@inbox.vuxu.org \
--to=rmccask@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).