[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/28: gnu: WebkitGTK: Fix build failure with ICU 65.
From: |
guix-commits |
Subject: |
04/28: gnu: WebkitGTK: Fix build failure with ICU 65. |
Date: |
Wed, 8 Jan 2020 15:58:44 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit eb5f3ea1003f76545b197b1e779e2967ec379475
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Dec 6 18:19:23 2019 +0100
gnu: WebkitGTK: Fix build failure with ICU 65.
* gnu/packages/patches/webkitgtk-icu-65.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/webkit.scm (webkitgtk)[source](patches): New field.
---
gnu/local.mk | 1 +
gnu/packages/patches/webkitgtk-icu-65.patch | 47 +++++++++++++++++++++++++++++
gnu/packages/webkit.scm | 1 +
3 files changed, 49 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index efbd906..7cb5cad 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1464,6 +1464,7 @@ dist_patch_DATA =
\
%D%/packages/patches/wavpack-CVE-2018-7253.patch \
%D%/packages/patches/wavpack-CVE-2018-7254.patch \
%D%/packages/patches/weasyprint-library-paths.patch \
+ %D%/packages/patches/webkitgtk-icu-65.patch \
%D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \
%D%/packages/patches/wicd-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
diff --git a/gnu/packages/patches/webkitgtk-icu-65.patch
b/gnu/packages/patches/webkitgtk-icu-65.patch
new file mode 100644
index 0000000..66819c5
--- /dev/null
+++ b/gnu/packages/patches/webkitgtk-icu-65.patch
@@ -0,0 +1,47 @@
+Fix build with ICU 65.
+
+Taken from upstream:
+https://bugs.webkit.org/show_bug.cgi?id=202600
+https://trac.webkit.org/r250747
+
+diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
+index 18e7f13cd615..c584f1a0cb7e 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<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) {
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 2443e24c9bc4..1fbb3a716006 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<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 };
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index b0b0d79..5101ceb 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -126,6 +126,7 @@ engine that uses Wayland for graphics output.")
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
"webkitgtk-" version ".tar.xz"))
+ (patches (search-patches "webkitgtk-icu-65.patch"))
(sha256
(base32
"04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b"))))
- 02/28: gnu: libfaketime: Fix failing test., (continued)
- 02/28: gnu: libfaketime: Fix failing test., guix-commits, 2020/01/08
- 08/28: gnu: sbcl-cffi: Update to 0.20.1., guix-commits, 2020/01/08
- 10/28: gnu: lcms: Do not build static library., guix-commits, 2020/01/08
- 09/28: gnu: libfreehand: Fix build with ICU 65., guix-commits, 2020/01/08
- 11/28: gnu: gd: Do not build static library., guix-commits, 2020/01/08
- 07/28: gnu: libsm: Do not build static library., guix-commits, 2020/01/08
- 12/28: gnu: libXpm: Gettext is a native input., guix-commits, 2020/01/08
- 05/28: gnu: dconf: Fix build failure with Meson 0.52., guix-commits, 2020/01/08
- 03/28: gnu: python-pyopenssl: Fix test failure., guix-commits, 2020/01/08
- 06/28: gnu: network-manager: Fix build with glibc 2.30., guix-commits, 2020/01/08
- 04/28: gnu: WebkitGTK: Fix build failure with ICU 65.,
guix-commits <=
- 15/28: gnu: cURL: Update to 7.68.0., guix-commits, 2020/01/08
- 13/28: gnu: libXpm: Update to 3.5.13., guix-commits, 2020/01/08
- 14/28: gnu: CMake: Update to 3.16.2., guix-commits, 2020/01/08
- 18/28: gnu: libarchive: Update to 3.4.1., guix-commits, 2020/01/08
- 21/28: gnu: RHash: Do not use unstable source tarball., guix-commits, 2020/01/08
- 20/28: gnu: meson: Update to 0.53.0., guix-commits, 2020/01/08
- 19/28: gnu: libjpeg-turbo: Update to 2.0.4., guix-commits, 2020/01/08
- 24/28: gnu: libpaper: Do not build the static library., guix-commits, 2020/01/08
- 25/28: gnu: teckit: Do not build the static library., guix-commits, 2020/01/08
- 26/28: gnu: Boost: Update to 1.72.0., guix-commits, 2020/01/08