[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41360] [PATCH v4 06/12] gnu: java-openjfx-build: Patch DumpRenderTr
From: |
Alexey Abramov |
Subject: |
[bug#41360] [PATCH v4 06/12] gnu: java-openjfx-build: Patch DumpRenderTree for the web component. |
Date: |
Sun, 7 Jun 2020 17:55:12 +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-DumpRenderTree-java.patch: New
file.
Signed-off-by: Alexey Abramov <levenson@mmer.org>
---
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
- [bug#41360] [PATCH v4 00/12] Improve OpenJFX and friends packages, Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 03/12] gnu: java-openjfx-swing: Add new variable., Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 02/12] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8, Alexey Abramov, 2020/06/07
- [bug#41360] [PATCH v4 01/12] gnu: java-openjfx-graphics: Implement a complete compilation., Alexey Abramov, 2020/06/07
- [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 <=
- [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, 2020/06/07