[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41360] [PATCH v2 8/9] gnu: java-openjfx-build: Prepare a patch to b
From: |
Alexey Abramov |
Subject: |
[bug#41360] [PATCH v2 8/9] gnu: java-openjfx-build: Prepare a patch to build openjfx-web. |
Date: |
Sat, 30 May 2020 18:41:22 +0200 |
* gnu/packages/java.scm (java-openjfx-build)[source]: Use it.
* gnu/packages/patches/java-openjfx-build-web-xlocale.h.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Alexey Abramov <levenson@mmer.org>
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 3 +-
.../java-openjfx-build-web-xlocale.h.patch | 52 +++++++++++++++++++
3 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/java-openjfx-build-web-xlocale.h.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index e15554f1c2..71d7079134 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1112,6 +1112,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-xlocale.h.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 ec9e24b8d3..f8a5b71a48 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2502,7 +2502,8 @@ new Date();"))
(base32
"0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f"))
(patches (search-patches "java-openjfx-build-jdk_version.patch"
-
"java-openjfx-build-swing-JFXPanel-JDK8.patch"))))
+
"java-openjfx-build-swing-JFXPanel-JDK8.patch"
+
"java-openjfx-build-web-xlocale.h.patch"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "java-openjfx.jar"
diff --git a/gnu/packages/patches/java-openjfx-build-web-xlocale.h.patch
b/gnu/packages/patches/java-openjfx-build-web-xlocale.h.patch
new file mode 100644
index 0000000000..138f39f9af
--- /dev/null
+++ b/gnu/packages/patches/java-openjfx-build-web-xlocale.h.patch
@@ -0,0 +1,52 @@
+Subject: [PATCH] Check <xlocale.h> header file
+
+Few libraries use hard-coded xlocale_h header even though if CMake takes care
+of it properly. Remove defined headers, and rely on CMake preprocessor
+instead.
+
+---
+ .../src/main/native/Source/ThirdParty/libxslt/linux/config.h | 2 +-
+ .../src/main/native/Source/ThirdParty/libxslt/src/config.h.in | 2 +-
+ modules/web/src/main/native/Source/cmake/OptionsCommon.cmake | 1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git
a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
+index bd44c163..b19b45f4 100644
+--- a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
++++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
+@@ -143,7 +143,7 @@
+ #define HAVE_VSPRINTF 1
+
+ /* Define to 1 if you have the <xlocale.h> header file. */
+-#define HAVE_XLOCALE_H 1
++/* #define HAVE_XLOCALE_H 1 */
+
+ /* Define to 1 if you have the `_stat' function. */
+ /* #undef HAVE__STAT */
+diff --git
a/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
b/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
+index 085354e9..0210fce2 100644
+--- a/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
++++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/src/config.h.in
+@@ -142,7 +142,7 @@
+ #undef HAVE_VSPRINTF
+
+ /* Define to 1 if you have the <xlocale.h> header file. */
+-#undef HAVE_XLOCALE_H
++/* #undef HAVE_XLOCALE_H */
+
+ /* Define to 1 if you have the `_stat' function. */
+ #undef HAVE__STAT
+diff --git a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
+index 3bbd2c4a..2b618dd6 100644
+--- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
++++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
+@@ -148,6 +148,7 @@ _HAVE_CHECK_INCLUDE(HAVE_STRINGS_H strings.h)
+ _HAVE_CHECK_INCLUDE(HAVE_SYS_PARAM_H sys/param.h)
+ _HAVE_CHECK_INCLUDE(HAVE_SYS_TIME_H sys/time.h)
+ _HAVE_CHECK_INCLUDE(HAVE_SYS_TIMEB_H sys/timeb.h)
++_HAVE_CHECK_INCLUDE(HAVE_XLOCALE_H xlocale.h)
+
+ # Check for functions
+ _HAVE_CHECK_FUNCTION(HAVE_ALIGNED_MALLOC _aligned_malloc)
+--
+2.24.1
--
2.26.2
- [bug#41360] [PATCH 08/12] gnu: java-openjfx-build: Prepare a patch to build openjfx-web., (continued)
- [bug#41360] [PATCH v2 1/9] gnu: java-openjfx-build: Add helpful patch., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 2/9] gnu: java-openjfx-build: Fix indentation., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 5/9] gnu: java-openjfx-swing: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 4/9] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8, Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 6/9] gnu: java-openjfx-swt: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 7/9] gnu: java-openjfx-controls: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 9/9] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v2 8/9] gnu: java-openjfx-build: Prepare a patch to build openjfx-web.,
Alexey Abramov <=
- [bug#41360] [PATCH v2 3/9] gnu: java-openjfx-graphics: Implement a complete compilation., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH 09/12] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH 03/12] gnu: java-openjfx-graphics: Implement a complete compilation., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 1/9] gnu: java-openjfx-build: Add helpful patch., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 2/9] gnu: java-openjfx-build: Fix indentation., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 6/9] gnu: java-openjfx-swt: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 7/9] gnu: java-openjfx-controls: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 4/9] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8, Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 9/9] gnu: java-openjfx-web: Add new variable., Alexey Abramov, 2020/05/30
- [bug#41360] [PATCH v3 8/9] gnu: java-openjfx-build: Prepare a patch to build openjfx-web., Alexey Abramov, 2020/05/30