mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/qt5/qt5webkit: fix build with ICU >= 76

Browse Source 
Since the bump of ICU from ICU 73 to ICU 77 in commit
dcee99507c, the build of qt5webkit fails
with:

/home/thomas/buildroot/br/output-all/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/unicode/char16ptr.h:271:38: error: ‘enable_if_t’ in namespace ‘std’ does not name a template type
  271 | template<typename T, typename = std::enable_if_t<std::is_same_v<T, UChar>>>
      |                                      ^~~~~~~~~~~

We taken two patches from Arch Linux, one which is a partial upstream
backport, and another which was submitted upstream, to address this
build issue.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2025-12-28 22:10:40 +01:00
committed by Julien Olivain
parent 31fd1e4a36
commit 0ad3afa191
2 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
package/qt5/qt5webkit/0010-Source-WTF-wtf-Platform.h-fix-build-with-newer-versi.patch Normal file
View File

@@ -0,0 +1,40 @@
From 30a9270a3fe9157a532e52458ee47b0f3fcc2f97 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Mon, 27 May 2024 23:23:11 +0300
Subject: [PATCH] Source/WTF/wtf/Platform.h: fix build with newer
versions of ICU
Partial backport of r260554 (79fe19caf)
In particular, we need -DU_SHOW_CPLUSPLUS_API=0 to avoid compilation
errors in C++ parts of ICU headers which we are not using anyway.
Change-Id: Ib45c74e3caad148fbd778d0c07330127f7dab5ec
Taken from: https://github.com/archlinux/aur/blob/qt5-webkit/qt5-webkit-icu75.patch
Upstream: part of https://github.com/qtwebkit/qtwebkit/commit/79fe19caf
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Source/WTF/wtf/Platform.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 5717f3ea1664..dfed4a13dd2b 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1125,6 +1125,13 @@
#define ENABLE_PLATFORM_FONT_LOOKUP 1
#endif
+/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */
+/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
+#define U_SHOW_CPLUSPLUS_API 0
+#ifdef __cplusplus
+#define UCHAR_TYPE char16_t
+#endif
+
#if COMPILER(MSVC)
#undef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
--
2.52.0

28
package/qt5/qt5webkit/0011-Disable-ICU-C-header-only-APIs-introduced-in-ICU-76.patch Normal file
View File

@@ -0,0 +1,28 @@
From bf253b37ebf3fd99fa3cc46bd737a88defa8914e Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Thu, 9 Jan 2025 14:18:31 +0300
Subject: [PATCH] Disable ICU C++ header-only APIs, introduced in ICU 76
They require C++17 which we do not have, but we do not need them anyway.
Upstream: https://github.com/qtwebkit/qtwebkit/pull/1107
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Source/WTF/wtf/Platform.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index dfed4a13dd2b..6ba6c3972aee 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1128,6 +1128,7 @@
/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */
/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
#define U_SHOW_CPLUSPLUS_API 0
+#define U_SHOW_CPLUSPLUS_HEADER_API 0
#ifdef __cplusplus
#define UCHAR_TYPE char16_t
#endif
--
2.52.0