[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41360] [PATCH v4 10/12] gnu: java-openjfx-build: Fix web component
From: |
Alexey Abramov |
Subject: |
[bug#41360] [PATCH v4 10/12] gnu: java-openjfx-build: Fix web component compilation with ICU 65+. |
Date: |
Sun, 7 Jun 2020 17:55:16 +0200 |
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/java.scm (java-openjfx-build)[source]: Use it.
* gnu/packages/patches/java-openjfx-build-web-icu.patch: New file.
Signed-off-by: Alexey Abramov <levenson@mmer.org>
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 1 +
.../patches/java-openjfx-build-web-icu.patch | 38 +++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 100644 gnu/packages/patches/java-openjfx-build-web-icu.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 85f8db7150..40458ac9c4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1114,6 +1114,7 @@ dist_patch_DATA =
\
%D%/packages/patches/java-openjfx-build-web-OptionsJava.cmake.patch \
%D%/packages/patches/java-openjfx-build-web-WTF.patch
\
%D%/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch
\
+ %D%/packages/patches/java-openjfx-build-web-icu.patch
\
%D%/packages/patches/java-powermock-fix-java-files.patch \
%D%/packages/patches/java-simple-xml-fix-tests.patch \
%D%/packages/patches/java-svg-salamander-Fix-non-det.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5da1476077..a17da610d2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2507,6 +2507,7 @@ new Date();"))
"java-openjfx-build-web-OptionsJava.cmake.patch"
"java-openjfx-build-web-WTF.patch"
"java-openjfx-build-web-WebKitCompilerFlags.cmake.patch"
+ "java-openjfx-build-web-icu.patch"
))))
(build-system ant-build-system)
(arguments
diff --git a/gnu/packages/patches/java-openjfx-build-web-icu.patch
b/gnu/packages/patches/java-openjfx-build-web-icu.patch
new file mode 100644
index 0000000000..3e5c4a770c
--- /dev/null
+++ b/gnu/packages/patches/java-openjfx-build-web-icu.patch
@@ -0,0 +1,38 @@
+Subject: [PATCH] Fix compilateion with ICU.
+
+Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652
+
+---
+ modules/web/src/main/native/Source/WebCore/dom/Document.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules/web/src/main/native/Source/WebCore/dom/Document.cpp
b/modules/web/src/main/native/Source/WebCore/dom/Document.cpp
+index ec30fb5..4b0ff9d 100644
+--- a/modules/web/src/main/native/Source/WebCore/dom/Document.cpp
++++ b/modules/web/src/main/native/Source/WebCore/dom/Document.cpp
+@@ -4704,12 +4704,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;
+ }
+@@ -4769,7 +4769,7 @@ ExceptionOr<std::pair<AtomicString, AtomicString>>
Document::parseQualifiedName(
+
+ 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.26.2
--
2.26.2
- [bug#41360] [PATCH v4 01/12] gnu: java-openjfx-graphics: Implement a complete compilation., (continued)
- [bug#41360] [PATCH v4 04/12] gnu: java-openjfx-swt: Add new variable., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 05/12] gnu: java-openjfx-controls: Add new variable., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 06/12] gnu: java-openjfx-build: Patch DumpRenderTree for the web component., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 09/12] gnu: java-openjfx-build: Fix web component linkage., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 07/12] gnu: java-openjfx-build: Do not use an embedded 3rd party libraries., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 11/12] gnu: java-openjfx-build: Ensure use of system provided libraries., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 08/12] gnu: java-openjfx-build: Fix web component compilation with ICU 59+., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 12/12] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 10/12] gnu: java-openjfx-build: Fix web component compilation with ICU 65+.,
Alexey Abramov <=