From nobody Mon Aug 28 19:12:35 2023 X-Original-To: dev-commits-ports-main@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 4RZKv75Tyjz4rs76; Mon, 28 Aug 2023 19:12:35 +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 4RZKv74t7kz3bls; Mon, 28 Aug 2023 19:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693249955; 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=jTveUyB7cukKhhIfSf1UKHphSdLiU7BiU2zHdcryt1o=; b=h1QsnBfsEnHOo7eRPUlaKofpxhg0bx6uBuNOolV/4ks8TeI5Bt1eRrb/izJBO7KoPWWR96 g+kynCCSzWy8/H8k6/7c3EKiIkatEvETvtwGc5M7e3qkleEZKrR1nfFz6YwzJVeiqT6Q8X jNJeY9wvxSvYBQHvpgU6w/kNkWNMZqsD9tXY09DRkoeRDiQrRrKhLOsvL11NrahrTO2yHL x4kTriFtlAqhZTZktgQqXga7XbCjU+i3qauH6Y3FOoLkePbVkg4xdBiF2XiS0lCLmiklRZ IWCE2NMAc8hu/VKGfjorSSVEhQOHftU7X4zM2KkShjc6vuDfss5vpScxYBOgrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693249955; a=rsa-sha256; cv=none; b=RM+N0dLage/MKaWGWeUCFG+M3F4Nivat+nrFZFnjD/otXfXmbRlgcX1Z1959phZYwpooAm rFICK8fHgy4jakqD9QQseQ9b8BdyZpXFNbi1dUb+N21K91XouZJWwuwfVASdLYerSdLWfY Y0tLB+JqC1vODKVXr0tF7eUwSgpl/Yag0aK2WyEMLsqdCRb+mCorrecImf5wsSx48ivGJZ 42Sg9FQQfhHdydtWK+S+DB57R7D02r0pfQdP14OayMwTemvHAZyvbd0snfg8yioN6GAweU qK94o1LAcQByV+XFkbg9QzsLqr+TqhpOD1o3MYqd+0kKjNdLmEviY7W/rHrZXw== 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=1693249955; 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=jTveUyB7cukKhhIfSf1UKHphSdLiU7BiU2zHdcryt1o=; b=ZCsC6mxWPArM9XO+2qA8Tj9+Pw4kfuzd784ACMcnpFg3xekanwaL2sp2H7cGOTn9MbEhEo fr91eliljSUeaACpCTrKHLl4V3gTBwZ7cr+vlHSs3mO6baWiwCMivjXI+siiwX578le030 7DZnTxsWM4brp+Qqdvm5o5Uq1KZbY/Sf8TRDF6d279cYcw+UpFM44Ag4yyiBWUm2I6vywJ wPpNRpF1nZ4ps54iQDa1nE4jSlAbQoMdwaeVx6jIKyfq/fLujWPxNmN1h0pspV6XIueEoW Z6h8OjHQCPYovlUzgzpBJKgRiEzIcDHLh7vhoWCrmRCvWjU/vhjJAF7AwrwipQ== 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 4RZKv73wrqz5bv; Mon, 28 Aug 2023 19:12:35 +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 37SJCZQL045908; Mon, 28 Aug 2023 19:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SJCZGh045905; Mon, 28 Aug 2023 19:12:35 GMT (envelope-from git) Date: Mon, 28 Aug 2023 19:12:35 GMT Message-Id: <202308281912.37SJCZGh045905@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: f14f291a6dfe - main - www/*chromium: bump _LIBCPP_VERSION check to 160000 and fallback to base::ranges List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f14f291a6dfea6d167aa9800a5ea05125c4b776f Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f14f291a6dfea6d167aa9800a5ea05125c4b776f commit f14f291a6dfea6d167aa9800a5ea05125c4b776f Author: Robert Nagy AuthorDate: 2023-08-28 12:57:23 +0000 Commit: Robert Nagy CommitDate: 2023-08-28 19:12:26 +0000 www/*chromium: bump _LIBCPP_VERSION check to 160000 and fallback to base::ranges the chromium source tree provides ranges functions so let's use them in case our libcxx is too old PR: 273376 --- www/chromium/Makefile | 1 + ...__manager_core_browser_ui_passwords__grouper.cc | 25 +++++--------- ..._webauthn_core_browser_passkey__sync__bridge.cc | 38 ++++++++-------------- www/ungoogled-chromium/Makefile | 1 + ...__manager_core_browser_ui_passwords__grouper.cc | 25 +++++--------- ..._webauthn_core_browser_passkey__sync__bridge.cc | 38 ++++++++-------------- 6 files changed, 46 insertions(+), 82 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index ca14ce792b6d..b70c1bb9bc24 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= chromium PORTVERSION= 116.0.5845.110 +PORTREVISION= 1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc b/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc index 21710d467d67..2fc39b9c22df 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc @@ -1,21 +1,14 @@ ---- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-08-17 12:40:56 UTC +--- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-08-28 12:53:33 UTC +++ components/password_manager/core/browser/ui/passwords_grouper.cc -@@ -399,6 +399,7 @@ absl::optional PasswordsGrouper::Ge - if (group_id_iterator == map_signon_realm_to_group_id_.end()) { - return absl::nullopt; - } -+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) - // Find the passkey in the group. +@@ -403,7 +403,11 @@ absl::optional PasswordsGrouper::Ge const std::vector& passkeys = map_group_id_to_credentials_[group_id_iterator->second].passkeys; -@@ -410,6 +411,10 @@ absl::optional PasswordsGrouper::Ge - return absl::nullopt; - } - return *passkey_it; + const auto passkey_it = ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::find_if(passkeys, [&credential](const auto& passkey) { +#else -+ LOG(ERROR) << "Unable to lookup in password group"; -+ return absl::nullopt; ++ base::ranges::find_if(passkeys, [&credential](const auto& passkey) { +#endif - } - - void PasswordsGrouper::ClearCache() { + return credential.passkey_credential_id == passkey.credential_id(); + }); + if (passkey_it == passkeys.end()) { diff --git a/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc index 3706546c7e46..6ce03fae477d 100644 --- a/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc +++ b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc @@ -1,38 +1,26 @@ ---- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-08-17 12:40:56 UTC +--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-08-28 12:53:33 UTC +++ components/webauthn/core/browser/passkey_sync_bridge.cc -@@ -267,6 +267,7 @@ PasskeySyncBridge::GetAllPasskeys() const { - +@@ -268,7 +268,11 @@ PasskeySyncBridge::GetAllPasskeys() const { bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { // Find the credential with the given |credential_id|. -+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) const auto passkey_it = ++#if (_LIBCPP_VERSION >= 160000) std::ranges::find_if(data_, [&credential_id](const auto& passkey) { - return passkey.second.credential_id() == credential_id; -@@ -313,11 +314,16 @@ bool PasskeySyncBridge::DeletePasskey(const std::strin - weak_ptr_factory_.GetWeakPtr())); - NotifyPasskeysChanged(); - return true; +#else -+ LOG(ERROR) << "Unable to delete passkey"; -+ return false; ++ base::ranges::find_if(data_, [&credential_id](const auto& passkey) { +#endif - } - - bool PasskeySyncBridge::UpdatePasskey(const std::string& credential_id, + return passkey.second.credential_id() == credential_id; + }); + if (passkey_it == data_.end()) { +@@ -319,7 +323,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin PasskeyChange change) { // Find the credential with the given |credential_id|. -+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) const auto passkey_it = ++#if (_LIBCPP_VERSION >= 160000) std::ranges::find_if(data_, [&credential_id](const auto& passkey) { - return passkey.second.credential_id() == credential_id; -@@ -341,6 +347,10 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin - weak_ptr_factory_.GetWeakPtr())); - NotifyPasskeysChanged(); - return true; +#else -+ LOG(ERROR) << "Unable to update passkey"; -+ return false; ++ base::ranges::find_if(data_, [&credential_id](const auto& passkey) { +#endif - } - - std::string PasskeySyncBridge::AddNewPasskeyForTesting( + return passkey.second.credential_id() == credential_id; + }); + if (passkey_it == data_.end()) { diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 342c55b3c4f4..ed418f68a92e 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,7 @@ PORTNAME= ungoogled-chromium PORTVERSION= 116.0.5845.110 UGVERSION= ${DISTVERSION}-1 +PORTREVISION= 1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc index 07062ea679a4..2fc39b9c22df 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc @@ -1,21 +1,14 @@ ---- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-08-18 10:26:52 UTC +--- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-08-28 12:53:33 UTC +++ components/password_manager/core/browser/ui/passwords_grouper.cc -@@ -399,6 +399,7 @@ absl::optional PasswordsGrouper::Ge - if (group_id_iterator == map_signon_realm_to_group_id_.end()) { - return absl::nullopt; - } -+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) - // Find the passkey in the group. +@@ -403,7 +403,11 @@ absl::optional PasswordsGrouper::Ge const std::vector& passkeys = map_group_id_to_credentials_[group_id_iterator->second].passkeys; -@@ -410,6 +411,10 @@ absl::optional PasswordsGrouper::Ge - return absl::nullopt; - } - return *passkey_it; + const auto passkey_it = ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::find_if(passkeys, [&credential](const auto& passkey) { +#else -+ LOG(ERROR) << "Unable to lookup in password group"; -+ return absl::nullopt; ++ base::ranges::find_if(passkeys, [&credential](const auto& passkey) { +#endif - } - - void PasswordsGrouper::ClearCache() { + return credential.passkey_credential_id == passkey.credential_id(); + }); + if (passkey_it == passkeys.end()) { diff --git a/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc index 1c2426b02813..6ce03fae477d 100644 --- a/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc +++ b/www/ungoogled-chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc @@ -1,38 +1,26 @@ ---- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-08-18 10:26:52 UTC +--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-08-28 12:53:33 UTC +++ components/webauthn/core/browser/passkey_sync_bridge.cc -@@ -267,6 +267,7 @@ PasskeySyncBridge::GetAllPasskeys() const { - +@@ -268,7 +268,11 @@ PasskeySyncBridge::GetAllPasskeys() const { bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { // Find the credential with the given |credential_id|. -+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) const auto passkey_it = ++#if (_LIBCPP_VERSION >= 160000) std::ranges::find_if(data_, [&credential_id](const auto& passkey) { - return passkey.second.credential_id() == credential_id; -@@ -313,11 +314,16 @@ bool PasskeySyncBridge::DeletePasskey(const std::strin - weak_ptr_factory_.GetWeakPtr())); - NotifyPasskeysChanged(); - return true; +#else -+ LOG(ERROR) << "Unable to delete passkey"; -+ return false; ++ base::ranges::find_if(data_, [&credential_id](const auto& passkey) { +#endif - } - - bool PasskeySyncBridge::UpdatePasskey(const std::string& credential_id, + return passkey.second.credential_id() == credential_id; + }); + if (passkey_it == data_.end()) { +@@ -319,7 +323,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin PasskeyChange change) { // Find the credential with the given |credential_id|. -+#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) const auto passkey_it = ++#if (_LIBCPP_VERSION >= 160000) std::ranges::find_if(data_, [&credential_id](const auto& passkey) { - return passkey.second.credential_id() == credential_id; -@@ -341,6 +347,10 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin - weak_ptr_factory_.GetWeakPtr())); - NotifyPasskeysChanged(); - return true; +#else -+ LOG(ERROR) << "Unable to update passkey"; -+ return false; ++ base::ranges::find_if(data_, [&credential_id](const auto& passkey) { +#endif - } - - std::string PasskeySyncBridge::AddNewPasskeyForTesting( + return passkey.second.credential_id() == credential_id; + }); + if (passkey_it == data_.end()) {