From nobody Mon Aug 28 13:41:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RZBXz44WRz4rYvS; Mon, 28 Aug 2023 13:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RZBXz3YZHz4LXB; Mon, 28 Aug 2023 13:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693230083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBWYRKILOpuk0RYYpqWOIP3lrzEtYp4r63J/RPR9fok=; b=RUEFA1cGOG5fWay40M8XYZluuTZ6hFPYKcxPdkiSNTilNMVjo/GvmyTsR0KVuxWctC/fHd E7Gj3yPouhcPZXdwp47olEg5lA9L1M3a+h9aTmPLzZPNWe+PT1yXQoUjRqE7G88o8AgDxU 2HYFzu4NpRFE3m2qKO/K4toDWIe1dHW5eW1vi2s0zULgs3TwUzw12dl6plxLf9zF7zQlUC iUVEm1IQDA51oPcTNsIQlGE6g4i11uYF7Ik9vn0zxQyI9PN2SU4FHF4sXbvVNb7GmOexYn 6hEC+y3cJoLFMs0pz+Z0gPQVBakpDvnSnc9tDF1JsyRsAbNZ+H71iievFdaKSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693230083; a=rsa-sha256; cv=none; b=Qv7HS5Jjdvu3AJPWE9J/5rZ5DPAYYKCgf+j2mDr0oR+U0XhgCmH1h5+fhCGN8wAePy9VT0 4R+vDceBWvPsZhfHnEke20LnZN2LRYD3pVVHdbSBbc6XQy0q9xWDgRLUXzEqwRO4sQMh2s H6IVbO8fPRJNOC7/WJM2UDmCNmAGaZ3N+2QiZZHfy9uiqBYZueWkrWpUxnjwNb/PHjBSz8 4gjQm1vQT7u0jByQumg3l/Xpd7nMVztn1tVu8r0YuMbVUfNQvWq7pxsUgPqkjYMZCLDYKm IxJbQMW/dKv1ecL6hbWra1D2iZmAngkS1hGCPaOyWa6SWvhRVHxoFZW2zKvmrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693230083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBWYRKILOpuk0RYYpqWOIP3lrzEtYp4r63J/RPR9fok=; b=pZbj7WCoHtXV6oDtn5nPsl3/Wi6cqJsOW/7GXPK0MHdDyc7bTzIh1stqQfMtAChCf7Ca9j QIopK3W5yFJbhT79+ycot9FBn9Z4cMJoLUgga4y4iYneqU4lVDMhCIdbbptXO+GghcjQZ+ F0+ZWpP8koMLpwrVCkerBSAa6xnYp+E5eCRC4hc0B5zntIAOQt3RD7bi68rMjX8noiki+Z YbDU+ioexM+OewrISYp5Z52+oUtkuQP8TOr3T1JqnmiN0ACUaP/cVYD1uNbQqwJGRlLkOr VrOWdJobxXCmeGedahGYGHkLK4EPPN3JX+ss8JlqpDO4oNd2YbmF7OSPwHjFMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RZBXz2dm9z19cJ; Mon, 28 Aug 2023 13:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37SDfNsm090762; Mon, 28 Aug 2023 13:41:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SDfN6q090759; Mon, 28 Aug 2023 13:41:23 GMT (envelope-from git) Date: Mon, 28 Aug 2023 13:41:23 GMT Message-Id: <202308281341.37SDfN6q090759@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 9d23691afbbc - main - www/qt6-webengine: Switch to bundled re2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d23691afbbc151dbc63933dc8ea370afc391eed Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d23691afbbc151dbc63933dc8ea370afc391eed commit 9d23691afbbc151dbc63933dc8ea370afc391eed Author: Kai Knoblich AuthorDate: 2023-08-28 13:23:32 +0000 Commit: Kai Knoblich CommitDate: 2023-08-28 13:40:40 +0000 www/qt6-webengine: Switch to bundled re2 * Prepare the port for newer versions of devel/re2, which also require devel/abseil. This combination however causes build errors [1] due to missing symbols: [...] In file included from gen/extensions/browser/browser_sources_jumbo_8.cc:6: ./../../../../../qtwebengine-everywhere-src-6.5.2/src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc:429:11: error: no member named 'set' in 'absl::string_view' source_.set(source.data(), source.size()); ~~~~~~~ ^ ./../../../../../qtwebengine-everywhere-src-6.5.2/src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc:573:11: error: no member named 'set' in 'absl::string_view' source_.set(source.data(), source.size()); ~~~~~~~ ^ [...] Unbundling abseil and its-subcomponents via "replace_gn_files.py" didn't help hence switch to the bundled re2 for now to have a consistent combination of re2 and abseil. * Bump PORTREVISION due dependency change. PR: 260402 [1] Reported by: diizzy [1] Reviewed by: diizzy, tcberner Differential Revision: https://reviews.freebsd.org/D41571 --- www/qt6-webengine/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index d3c3c69644b2..24fda63780d9 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -15,7 +15,7 @@ PORTNAME= webengine DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -41,7 +41,6 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ - libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp \ @@ -56,6 +55,10 @@ USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ xrandr xrender xscrnsaver xshmfence xtst CMAKE_ON= QT_FEATURE_webengine_system_ffmpeg QT_FEATURE_webengine_proprietary_codecs +# See https://reviews.freebsd.org/D41571 for further details. From time to +# time, e.g. with new qt6-webengine releases, it should be checked whether +# re2 can be unbundled again. +CMAKE_OFF= QT_FEATURE_webengine_system_re2 # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are