From: Alexey Abramov <levenson@mmer.org>
To: 39746@debbugs.gnu.org
Cc: Alexey Abramov <levenson@mmer.org>
Subject: [bug#39746] [v2 1/2] gnu: java-openjfx-build: Prepare a patch to build openjfx-web
Date: Mon, 9 Mar 2020 22:41:43 +0100 [thread overview]
Message-ID: <20200309214144.280573-1-levenson@mmer.org> (raw)
In-Reply-To: <20200222201755.50425-7-levenson@mmer.org>
* gnu/packages/java.scm (java-openjfx-build)[source]: Use it.
* gnu/packages/patches/java-openjfx-build-web-Check-xlocale.h-header-file.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 3 +-
| 56 +++++++++++++++++++
3 files changed, 59 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/java-openjfx-build-web-Check-xlocale.h-header-file.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 7e4554198c..7b9af7794a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1035,6 +1035,7 @@ dist_patch_DATA = \
%D%/packages/patches/java-jeromq-fix-tests.patch \
%D%/packages/patches/java-openjfx-build-get_guix_jdk_version.patch \
%D%/packages/patches/java-openjfx-build-swing-compile-JFXPanel-with-JDK-8.patch \
+ %D%/packages/patches/java-openjfx-build-web-Check-xlocale.h-header-file.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 21ff1b4a30..7d044ead89 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2364,7 +2364,8 @@ new Date();"))
(base32
"0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f"))
(patches (search-patches "java-openjfx-build-get_guix_jdk_version.patch"
- "java-openjfx-build-swing-compile-JFXPanel-with-JDK-8.patch"))))
+ "java-openjfx-build-swing-compile-JFXPanel-with-JDK-8.patch"
+ "java-openjfx-build-web-Check-xlocale.h-header-file.patch"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "java-openjfx.jar"
--git a/gnu/packages/patches/java-openjfx-build-web-Check-xlocale.h-header-file.patch b/gnu/packages/patches/java-openjfx-build-web-Check-xlocale.h-header-file.patch
new file mode 100644
index 0000000000..9200911d17
--- /dev/null
+++ b/gnu/packages/patches/java-openjfx-build-web-Check-xlocale.h-header-file.patch
@@ -0,0 +1,56 @@
+From 95fe8463a3283f0f2c72fcf3416ebfac095688e5 Mon Sep 17 00:00:00 2001
+From: Alexey Abramov <levenson@mmer.org>
+Date: Sun, 9 Feb 2020 18:31:26 +0100
+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.24.1
next prev parent reply other threads:[~2020-03-09 21:42 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-22 20:17 [bug#39742] [PATCH 1/7] gnu: java-openjfx-build: Add helpful patch Alexey Abramov
2020-02-22 20:17 ` [bug#39744] [PATCH 2/7] gnu: java-openjfx-build: Fix indentation Alexey Abramov
2020-02-22 20:17 ` [bug#39747] [PATCH 3/7] gnu: java-openjfx-graphics: Implement a complete compilation Alexey Abramov
2020-03-04 3:00 ` Leo Famulari
2020-03-09 13:08 ` levenson
2020-03-09 12:46 ` [bug#39747] [v2] " Alexey Abramov
2020-02-22 20:17 ` [bug#39745] [PATCH 4/7] gnu: java-openjfx-swing: Add new variable Alexey Abramov
2020-03-04 3:04 ` Leo Famulari
2020-03-09 22:08 ` [bug#39741] " levenson
2020-03-09 16:15 ` [bug#39745] [v2] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8 Alexey Abramov
2020-03-09 16:36 ` [bug#39745] [v3 1/2] " Alexey Abramov
2020-03-09 16:36 ` [bug#39745] [v3 2/2] gnu: java-openjfx-swing: Add new variable Alexey Abramov
2020-03-11 10:36 ` [bug#39745] [v4 1/2] gnu: java-openjfx-build: Fix openjfx-swing component build for JDKu8 Alexey Abramov
2020-03-11 10:36 ` [bug#39745] [v4 2/2] gnu: java-openjfx-swing: Add new variable Alexey Abramov
2020-02-22 20:17 ` [bug#39741] [PATCH 5/7] gnu: java-openjfx-swt: " Alexey Abramov
2020-03-09 16:41 ` [bug#39741] [v2] " Alexey Abramov
2020-02-22 20:17 ` [bug#39743] [PATCH 6/7] gnu: java-openjfx-controls: " Alexey Abramov
2020-03-09 16:54 ` [bug#39743] [v2] " Alexey Abramov
2020-02-22 20:17 ` [bug#39746] [PATCH 7/7] gnu: java-openjfx-web: " Alexey Abramov
2020-03-04 3:07 ` Leo Famulari
2020-03-09 22:13 ` [bug#39741] " levenson
2020-03-17 22:17 ` Tobias Geerinckx-Rice via Guix-patches via
2020-03-09 21:41 ` Alexey Abramov [this message]
2020-03-09 21:41 ` [bug#39746] [v2 2/2] " Alexey Abramov
2020-03-14 6:10 ` [bug#39746] [v3 1/2] gnu: java-openjfx-build: Prepare a patch to build openjfx-web Alexey Abramov
2020-03-14 6:10 ` [bug#39746] [v3 2/2] gnu: java-openjfx-web: Add new variable Alexey Abramov
2020-03-04 2:56 ` [bug#39742] [PATCH 1/7] gnu: java-openjfx-build: Add helpful patch Leo Famulari
2020-03-05 20:42 ` Alexey Abramov
2020-03-05 19:09 ` Björn Höfling
2020-03-05 20:10 ` Alexey Abramov
2020-03-05 21:35 ` Björn Höfling
2020-03-08 19:40 ` [bug#39742] [v2] " Alexey Abramov
2020-03-15 18:19 ` bug#39742: " Leo Famulari
2020-03-17 21:12 ` [bug#39742] " Björn Höfling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200309214144.280573-1-levenson@mmer.org \
--to=levenson@mmer.org \
--cc=39746@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).