From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eBe4MFkO3V5yXQAA0tVLHw (envelope-from ) for ; Sun, 07 Jun 2020 15:57:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KD6pLFkO3V40agAA1q6Kng (envelope-from ) for ; Sun, 07 Jun 2020 15:57:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5CE4B94053B for ; Sun, 7 Jun 2020 15:57:13 +0000 (UTC) Received: from localhost ([::1]:60704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhxfc-0001Jy-BF for larch@yhetil.org; Sun, 07 Jun 2020 11:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhxfS-0001Jh-EP for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhxfS-0005TB-5V for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhxfS-0007rk-4e for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41360] [PATCH v4 06/12] gnu: java-openjfx-build: Patch DumpRenderTree for the web component. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jun 2020 15:57:02 +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.159154536530134 (code B ref 41360); Sun, 07 Jun 2020 15:57:02 +0000 Received: (at 41360) by debbugs.gnu.org; 7 Jun 2020 15:56:05 +0000 Received: from localhost ([127.0.0.1]:54702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxeT-0007p3-Qk for submit@debbugs.gnu.org; Sun, 07 Jun 2020 11:56:05 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:62721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxe1-0007mc-Eh for 41360@debbugs.gnu.org; Sun, 07 Jun 2020 11:55:40 -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 4769C9CFB3 for <41360@debbugs.gnu.org>; Sun, 7 Jun 2020 15:24:46 +0000 (UTC) From: Alexey Abramov Date: Sun, 7 Jun 2020 17:55:12 +0200 Message-Id: <20200607155518.1400-7-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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 0RDaHU5Rx+la * 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-DumpRenderTree-java.patch: New file. Signed-off-by: Alexey Abramov --- gnu/local.mk | 1 + gnu/packages/java.scm | 1 + ...penjfx-build-web-DumpRenderTree-java.patch | 30 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 gnu/packages/patches/java-openjfx-build-web-DumpRenderTree-java.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5fe0eeadda..f8a59da3da 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1110,6 +1110,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-openjfx-build-swing-JFXPanel-JDK8.patch \ + %D%/packages/patches/java-openjfx-build-web-DumpRenderTree-java.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 e05289758a..d60ae7c8f1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2503,6 +2503,7 @@ new Date();")) "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")) (patches (search-patches "java-openjfx-build-jdk_version.patch" "java-openjfx-build-swing-JFXPanel-JDK8.patch" + "java-openjfx-build-web-DumpRenderTree-java.patch" )))) (build-system ant-build-system) (arguments diff --git a/gnu/packages/patches/java-openjfx-build-web-DumpRenderTree-java.patch b/gnu/packages/patches/java-openjfx-build-web-DumpRenderTree-java.patch new file mode 100644 index 0000000000..0200e92c05 --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-web-DumpRenderTree-java.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] Fix DumpRenderTree linking. + +DumpRenderTree compiles OK, but fails on a linking stage with the bellow +error. I found the very same fix for openjfx-8 FreeBSD ports as well. Let's +ignore undefined references for now. + +CMakeFiles/DumpRenderTreeJava.dir/__/TestRunner.cpp.o:TestRunner.cpp:function TestRunner::runUIScript(OpaqueJSContext const*, OpaqueJSString*, OpaqueJSValue const*): error: undefined reference to 'WTF::String::String(unsigned short const*, unsigned int)' +CMakeFiles/DumpRenderTreeJava.dir/__/__/TestRunnerShared/UIScriptContext/UIScriptContext.cpp.o:UIScriptContext.cpp:function WTR::UIScriptContext::tryToCompleteUIScriptForCurrentParentCallback(): error: undefined reference to 'WTF::String::String(unsigned short const*, unsigned int)' +collect2: error: ld returned 1 exit status + +--- + .../src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt b/modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt +index e2ce5ef..2ad3db7 100644 +--- a/modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt ++++ b/modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt +@@ -72,9 +72,5 @@ add_library(DumpRenderTreeJava SHARED ${DumpRenderTree_SOURCES}) + add_definitions(-DWEBCORE_EXPORT=WTF_IMPORT -DWEBCORE_TESTSUPPORT_EXPORT=WTF_IMPORT) + add_dependencies(DumpRenderTreeJava DumpRenderTreeBindings) + +-if (UNIX AND NOT APPLE) +- set_target_properties(DumpRenderTreeJava PROPERTIES LINK_FLAGS "-Wl,--no-undefined") +-endif () +- + set_target_properties(DumpRenderTreeJava PROPERTIES OUTPUT_NAME "DumpRenderTreeJava") + target_link_libraries(DumpRenderTreeJava ${DumpRenderTree_LIBRARIES}) +-- +2.26.2 -- 2.26.2