From nobody Sun Feb 25 20:11:33 2024 X-Original-To: dev-commits-ports-branches@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 4TjZdf44vPz5C0lT; Sun, 25 Feb 2024 20:11:34 +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 4TjZdf0s9Rz4PWr; Sun, 25 Feb 2024 20:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708891894; 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=fEeD5J5eG8wbSGoEyX7lmT+9o/Cc8KX+EwoFy4LYa2U=; b=r730fM/EA+DJawCFoQ0PL6tAr2hdyTu8cVP3WhjFQeRRrFkaOERjuppVTHvytx1FR9zrwu 4pFaZcFkQ7Icu7MzNVrvg/jTS2FAELmqIgkslFioj1jXyEpKYCvab7HyQjpiKQRe/+Bcf/ hXkGlFab4c7aPg+0SCpze4PiBUA2v+dzRcUEfryAPqx7OhTDaQjmaz+DT8iQ5/Bkc6Yo5O vvtiVfMUCosdLB7Sl4UTRCMbNEa+NxIotPyb9OWTVP9cNCtb5zF8W0S0nnZWeL/7LmP+B/ kKYc968deiLq+cLbg+8ukDN0lzxhjLPrp/1a74xzfj5pFnPw28cu4dpuMu8yIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708891894; a=rsa-sha256; cv=none; b=NuTXS5DvIflplco+OGOD6MO0aJPtBOJJzc8iODXa1fP7IqMEoYFX43VxVwAe7AKZjUKK8e T+rUjSyqtCELAY5U4+7QeG9azojAT9KQAS+ZG4ElvwSe0qzFTfbFcaQm8Kb7SoqUobKMp2 ayeCIRbIx7sbWp8kbW7QP/HlzG/P87wcsZP+Rex+rtapbS6tOW6aZqcRt9KrBnjTcXZ9jG 3a9SI1vN6XGtKI6blN/rrNLqofHOuUWEHaWAwFtkQ6w8lFndfD+mLih35JxSsEQn2/HKrv kuaf+KhriBDn1g8W3/9zEyRR9q5KOkwmXcjjegB+x7bybShxjLf8vrHR+9uCIA== 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=1708891894; 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=fEeD5J5eG8wbSGoEyX7lmT+9o/Cc8KX+EwoFy4LYa2U=; b=QydcoJQm0+5aKBOYMMLnp310mj4fLCZU9KOCS0DDCVNdiPO3cI80AJfyyqeBaZ6ED/ejRk sPhgE3vB+LuWNwFQmygcAp0fuz7nCBTK+41Vah5f0OYjrCNU22q5GoLwzBChhW1QntUDvC 8knQgvLRz5Mm4BcmubFNskcQCX6r9JSOI7kCdjhiq8TSKruvKRKj9jPspkDaRkNwepsJzR qtMgLx1pqTEI1oCl0841qHkqCN8WjUmzD0bqpUkCwwOG5miNt8ldP5HJT9ycohIcKQRM6Z e3IlWTsOtJQdKseFpgswjahyFPGS17LkvQbz1nj95O+HWPEkOgX/ka4B5/dwQA== 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 4TjZdd74cJzyC6; Sun, 25 Feb 2024 20:11:33 +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 41PKBXQE052617; Sun, 25 Feb 2024 20:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PKBXVI052614; Sun, 25 Feb 2024 20:11:33 GMT (envelope-from git) Date: Sun, 25 Feb 2024 20:11:33 GMT Message-Id: <202402252011.41PKBXVI052614@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: e55929b84c55 - 2024Q1 - www/chromium: unbreak build on i386 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: e55929b84c554dffc3287e8def5bec40ab8c30ab Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e55929b84c554dffc3287e8def5bec40ab8c30ab commit e55929b84c554dffc3287e8def5bec40ab8c30ab Author: Robert Nagy AuthorDate: 2024-02-25 20:11:00 +0000 Commit: Robert Nagy CommitDate: 2024-02-25 20:11:29 +0000 www/chromium: unbreak build on i386 (cherry picked from commit 6166c62620dcd2a760e4306bd8a33716cdfb6bb0) --- ...party_perfetto_src_trace__processor_db_column.h | 15 --------------- ..._trace__processor_db_column_numeric__storage.cc | 22 ++++++++++------------ 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column.h b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column.h deleted file mode 100644 index 1eac1a4617f9..000000000000 --- a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column.h +++ /dev/null @@ -1,15 +0,0 @@ ---- third_party/perfetto/src/trace_processor/db/column.h.orig 2024-02-06 12:08:38 UTC -+++ third_party/perfetto/src/trace_processor/db/column.h -@@ -48,6 +48,12 @@ template <> - struct ColumnTypeHelper { - static constexpr ColumnType ToColumnType() { return ColumnType::kInt64; } - }; -+#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) -+template <> -+struct ColumnTypeHelper { -+ static constexpr ColumnType ToColumnType() { return ColumnType::kDouble; } -+}; -+#endif - template <> - struct ColumnTypeHelper { - static constexpr ColumnType ToColumnType() { return ColumnType::kDouble; } diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc index 3662d9018c68..54b343933318 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc @@ -1,16 +1,14 @@ ---- third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc.orig 2024-02-23 21:04:38 UTC +--- third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc.orig 2024-02-25 20:08:06 UTC +++ third_party/perfetto/src/trace_processor/db/column/numeric_storage.cc -@@ -494,8 +494,13 @@ BitVector NumericStorageBase::LinearSearchInternal(Fil - } else if (const auto* i32 = std::get_if(&val)) { - auto* start = static_cast(data_) + range.start; - TypedLinearSearch(*i32, start, op, builder); +@@ -39,7 +39,11 @@ namespace trace_processor { + namespace column { + namespace { + +#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) -+ } else if (const auto* db = std::get_if(&*val)) { -+ auto* start = static_cast(data_) + range.start; ++using NumericValue = std::variant; +#else - } else if (const auto* db = std::get_if(&val)) { - auto* start = static_cast(data_) + range.start; + using NumericValue = std::variant; +#endif - TypedLinearSearch(*db, start, op, builder); - } else { - PERFETTO_DFATAL("Invalid"); + + // Using the fact that binary operators in std are operators() of classes, we + // can wrap those classes in variants and use them for std::visit in