[neon/qt/qtwebengine/Neon/release_jammy] debian: Add a patch from Gentoo to fix build with ICU 74.

Soren Stoutner null at kde.org
Wed Aug 21 09:44:47 BST 2024


Git commit bef1f838fa9f6f8e4d66b6ba49730f77677ad3ef by Soren Stoutner, on behalf of Dmitry Shachnev.
Committed on 08/05/2024 at 00:11.
Pushed by jriddell into branch 'Neon/release_jammy'.

Add a patch from Gentoo to fix build with ICU 74.

M  +3    -0    debian/changelog
A  +17   -0    debian/patches/icu74.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtwebengine/-/commit/bef1f838fa9f6f8e4d66b6ba49730f77677ad3ef

diff --git a/debian/changelog b/debian/changelog
index 4ad5903..5170425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ qtwebengine-opensource-src (5.15.15+dfsg-4) UNRELEASED; urgency=medium
     - debian/patches/system-openjpeg2.patch
   * Add 2024 to debian/copyright entries.
 
+  [ Dmitry Shachnev ]
+  * Add a patch from Gentoo to fix build with ICU 74.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 07 May 2024 16:40:19 -0700
 
 qtwebengine-opensource-src (5.15.15+dfsg-3) unstable; urgency=medium
diff --git a/debian/patches/icu74.patch b/debian/patches/icu74.patch
new file mode 100644
index 0000000..3ac7c6c
--- /dev/null
+++ b/debian/patches/icu74.patch
@@ -0,0 +1,17 @@
+Description: fix static_assert failure with ICU 74
+Origin: Gentoo, https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
+Last-Update: 2023-12-25
+
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -162,7 +162,9 @@ static const unsigned char kAsciiLineBre
+ };
+ // clang-format on
+ 
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)
+ #else
+ #define BA_LB_COUNT U_LB_COUNT
diff --git a/debian/patches/series b/debian/patches/series
index e0a6f4e..115c30e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ disable-catapult.patch
 pipewire-0.3.patch
 ffmpeg-x86-optimization.patch
 fix-example-pro-files.patch
+icu74.patch



More information about the Neon-commits mailing list