From nobody Wed Sep 13 06:00:57 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 4RlqZL1cC3z4tDkG; Wed, 13 Sep 2023 06:00:58 +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 4RlqZL1BdXz4K74; Wed, 13 Sep 2023 06:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694584858; 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=SC9+2yRPJmBWXrlpXZZM0r+Vd1byQaGaCUQ5htcLzvw=; b=bzqn4MdmzKZOzkvXhhgL9UGJSVnzrhkLDJzgQUuTIdeUUiHyLe917IIJ2Qg3B8yUotMhcM M5phcksKyk7tMD5mB4s7omSJV8We6Q+Xu8EacoZzPapv7gG8hnkn65TCbYW59iFttOrDXm 3gUfEyTGvIPpxsSKsYp+RESLcDbIiipC84TAzyqgm9fS1+N7rfVAmD7xk5PhKqJtpI2fdI ozlItRzI6RJl8YNaZM4N3+YDJb/RbmcPdWZ2IrlsbSQcgBYB2SCGI7HjQ5pZbwO6zKKpaP 3Httkpaaby2tsNOXgLkewcm9nkMke4zElZwkEoaRX7nL3FlKGvX6fVYsg2i4MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694584858; a=rsa-sha256; cv=none; b=tj/PGf05y3UQLNXLLTMD39SLCFnYXxyu6tv2NzCszJH6s8IBSH/gHcEsqfBsR/VdqBTMvg e6tJ6Rxt6IOEmvrFuIRUuQ4uwnXA9JSV1DmsoAHYYFC8qr738Gh/SpnZs0RcrlLUB1Qrxm iIEZ64WFMM2QIwn8K91uu91lHnFBgEpe3tYpOqnk9WF/1PEeE2US7VRK9o60w23W795wbc HNqb1FzFDBjUEUZrsZECqFHl4h43Ek4tP3W0iNqrNo7syigVxUOTo0knQi4KsBzJTYhHjH HkA6nCuBu3BA7wi5QH9UXTnagYHTq6IwrlYr5WlxmJ5IN95B4OZyI9H+ELzDFA== 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=1694584858; 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=SC9+2yRPJmBWXrlpXZZM0r+Vd1byQaGaCUQ5htcLzvw=; b=d4jnAzYACUXmGo7NZDNK6B4NL1NPK8xYXkxpbvQwTYU2gUe9jRBf9Mkp4xUuMI/CZCxSzD h9koSM5I6HYam5rHrEqaOrXY+p19E6xwzDe0qNt+XlOE8kAlzzwIXYZ0rQRO6dHSeuhmZ1 AQuN2K+V/7qvzl7KFte2JKhp/83jn37HYixcYwjj9jdp+4nGfAnB5yTljoBt2TFprQU7Qx 6w1VZW9Xb0ZxP2frHX8XDqA05moEqqxySWdOD3dfbTw+QjMpH0QjuKeI/DwTLio6BxltLG 3eKypQ0Li1OQXitoaogbEv8ltizz+UMEqbc6cxAfUNaEUJngVAAofXBRx7k8NQ== 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 4RlqZL0Fy1z12YH; Wed, 13 Sep 2023 06:00:58 +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 38D60vqV093365; Wed, 13 Sep 2023 06:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38D60vf7093362; Wed, 13 Sep 2023 06:00:57 GMT (envelope-from git) Date: Wed, 13 Sep 2023 06:00:57 GMT Message-Id: <202309130600.38D60vf7093362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 190bd2d09011 - main - www/qt5-webengine: switch to using 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 190bd2d090115c5c38661198d16fd55288aeb9c1 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=190bd2d090115c5c38661198d16fd55288aeb9c1 commit 190bd2d090115c5c38661198d16fd55288aeb9c1 Author: Tobias C. Berner AuthorDate: 2023-09-13 05:55:39 +0000 Commit: Tobias C. Berner CommitDate: 2023-09-13 06:00:30 +0000 www/qt5-webengine: switch to using bundled re2 See 9d23691afbbc151dbc63933dc8ea370afc391eed for a similar change in www/qt6-webengine. Using system re2 leads to compile failures with: [...] ../../../../qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/gpu/command_buffer/service/program_manager.cc:627:25: error: no member named 'as_string' in 'absl::string_view' return output + input.as_string(); ~~~~~ ^ [...] * PORTREVISION intentionally was not bumped. --- www/qt5-webengine/Makefile | 1 - www/qt5-webengine/files/patch-src_core_config_linux.pri | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 93ce67c120c1..c782f72dcff8 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -44,7 +44,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 diff --git a/www/qt5-webengine/files/patch-src_core_config_linux.pri b/www/qt5-webengine/files/patch-src_core_config_linux.pri index 69a53d590201..c867587be127 100644 --- a/www/qt5-webengine/files/patch-src_core_config_linux.pri +++ b/www/qt5-webengine/files/patch-src_core_config_linux.pri @@ -1,4 +1,4 @@ ---- src/core/config/linux.pri.orig 2020-11-07 01:22:36 UTC +--- src/core/config/linux.pri.orig 2021-12-15 16:12:54 UTC +++ src/core/config/linux.pri @@ -20,6 +20,12 @@ qtConfig(webengine-embedded-build) { gn_args += use_alsa=false @@ -13,3 +13,11 @@ !packagesExist(libpci): gn_args += use_libpci=false qtConfig(webengine-ozone-x11) { +@@ -39,6 +45,6 @@ qtConfig(webengine-embedded-build) { + qtConfig(webengine-system-libvpx): gn_args += use_system_libvpx=true + qtConfig(webengine-system-icu): gn_args += use_system_icu=true icu_use_data_file=false + qtConfig(webengine-system-ffmpeg): gn_args += use_system_ffmpeg=true +- qtConfig(webengine-system-re2): gn_args += use_system_re2=true ++ qtConfig(webengine-system-re2): gn_args += use_system_re2=false + qtConfig(webengine-system-lcms2): gn_args += use_system_lcms2=true + }