From patchwork Sun Jun 7 15:55:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 22591 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1344727BBE3; Sun, 7 Jun 2020 16:57:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9866527BBE1 for ; Sun, 7 Jun 2020 16:57:20 +0100 (BST) Received: from localhost ([::1]:33076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhxfk-0001b9-6g for patchwork@mira.cbaines.net; Sun, 07 Jun 2020 11:57:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhxfU-0001K2-NP for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhxfU-0005Uq-EV for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhxfU-0007sS-EN for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41360] [PATCH v4 10/12] gnu: java-openjfx-build: Fix web component compilation with ICU 65+. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jun 2020 15:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41360 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41360@debbugs.gnu.org Received: via spool by 41360-submit@debbugs.gnu.org id=B41360.159154538530193 (code B ref 41360); Sun, 07 Jun 2020 15:57:04 +0000 Received: (at 41360) by debbugs.gnu.org; 7 Jun 2020 15:56:25 +0000 Received: from localhost ([127.0.0.1]:54720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxed-0007qe-VP for submit@debbugs.gnu.org; Sun, 07 Jun 2020 11:56:24 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:62744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxe4-0007mu-9k for 41360@debbugs.gnu.org; Sun, 07 Jun 2020 11:55:42 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 0569E9D066 for <41360@debbugs.gnu.org>; Sun, 7 Jun 2020 15:24:46 +0000 (UTC) From: Alexey Abramov Date: Sun, 7 Jun 2020 17:55:16 +0200 Message-Id: <20200607155518.1400-11-levenson@mmer.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200607155518.1400-1-levenson@mmer.org> References: <20200607155518.1400-1-levenson@mmer.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 --- 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> 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