commit: b318bfa471b373999512d794f50bd5349fa6a6d5 Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com> AuthorDate: Mon Jul 29 18:53:28 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 29 20:19:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b318bfa4
dev-qt/qtwebengine: fix re2 compatibility Use bundled re2 to avoid the compatibility issue for qtwebengine-5.15.14_p20240510. Closes: https://bugs.gentoo.org/913923 Bug: https://bugs.gentoo.org/936884 Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37785 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/qtwebengine-5.15.14_p20240510-re2.patch | 14 ++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch new file mode 100644 index 000000000000..cbfa44edce31 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch @@ -0,0 +1,14 @@ +# https://bugs.gentoo.org/913923 + + Fix missing {-no,}-webengine-re2 command line options + +--- a/src/core/configure.json ++++ b/src/core/configure.json +@@ -16,6 +16,7 @@ + "webengine-icu": { "type": "enum", "name": "webengine-system-icu", "values": { "system": "yes", "qt": "no" } }, + "webengine-ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, + "webengine-opus": { "type": "enum", "name": "webengine-system-opus", "values": { "system": "yes", "qt": "no" } }, ++ "webengine-re2": { "type": "enum", "name": "webengine-system-re2", "values": { "system": "yes", "qt": "no" } }, + "webengine-webp": { "type": "enum", "name": "webengine-system-libwebp", "values": { "system": "yes", "qt": "no" } }, + "webengine-pepper-plugins": "boolean", + "webengine-printing-and-pdf": "boolean", diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild index 63451386d971..31ca92a14959 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild @@ -41,7 +41,6 @@ RDEPEND=" dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt - dev-libs/re2:= =dev-qt/qtcore-${QT5_PV}* =dev-qt/qtdeclarative-${QT5_PV}* =dev-qt/qtgui-${QT5_PV}* @@ -102,6 +101,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${WORKDIR}/${PATCHSET}" "${FILESDIR}/${PN}-5.15.13_p20240510-gcc15.patch" + "${FILESDIR}/${P}-re2.patch" ) python_check_deps() { @@ -231,6 +231,7 @@ src_configure() { $(usex screencast -webengine-webrtc-pipewire '') -qt-ffmpeg # bug 831487 $(qt_use system-icu webengine-icu) + -no-webengine-re2 # bug 913923 ) qt5-build_src_configure }
