commit: b7982facbd6d596888e100c11b07fff5599e2203 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Nov 20 12:43:15 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Nov 20 13:43:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7982fac
dev-qt/qtwebengine: fix build with icu74 (qt6) Just a quick fix, not fixed in either upstreams yet. Have not tried qt5. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch | 14 ++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 1 + 4 files changed, 17 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch new file mode 100644 index 000000000000..d08ede535862 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch @@ -0,0 +1,14 @@ +Quick fix for a static_assert failure with icu74. Still waiting +for a proper upstream fix and unknown if entirely right, but is +an extension of [1] (is now 48 rather than 43). + +[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192 +--- 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 +@@ -163,3 +163,5 @@ + +-#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) diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild index 286f497b5721..41ccab685127 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild @@ -103,6 +103,7 @@ PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch "${FILESDIR}"/${PN}-6.5.2-cstdint.patch + "${FILESDIR}"/${PN}-6.5.3-icu74.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild index e276911c1b95..234c81fd1039 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild @@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.5.3-icu74.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index e96a31845a16..d7f460872c21 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions + "${FILESDIR}"/${PN}-6.5.3-icu74.patch ) python_check_deps() {