From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50E1A159C96 for ; Mon, 29 Jul 2024 20:20:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44201E2AFB; Mon, 29 Jul 2024 20:20:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F32BAE2AFB for ; Mon, 29 Jul 2024 20:20:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9F0133C84E for ; Mon, 29 Jul 2024 20:20:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5454A1D87 for ; Mon, 29 Jul 2024 20:20:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1722284372.b318bfa471b373999512d794f50bd5349fa6a6d5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-re2.patch dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b318bfa471b373999512d794f50bd5349fa6a6d5 X-VCS-Branch: master Date: Mon, 29 Jul 2024 20:20:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a38162b-c969-4d1d-b20e-505d8af7d5a5 X-Archives-Hash: f18ece476ac63fc6cb78191c7d39546a commit: b318bfa471b373999512d794f50bd5349fa6a6d5 Author: Aliaksei Urbanski gmail com> AuthorDate: Mon Jul 29 18:53:28 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37785 Signed-off-by: Sam James 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 }