From nobody Sun Feb 25 20:11:20 2024 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 4TjZdP0H7Pz5C0MQ; Sun, 25 Feb 2024 20:11:21 +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 4TjZdN6ZJCz4P8x; Sun, 25 Feb 2024 20:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708891880; 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=1kycC4paELwmr0qieUKtgqFKZKOx51+l8m2LjGEflzc=; b=SdlSNPZ+IO3U1C2+M3dZ7ZpTAGK+OP/Yk6baGwAeD9aW+ofSES6IgTOo1DEDkghOFMXKzC 3gncmPfYq2qbuqbQkx2GBkN5P9qA5NuSYtm1B04EFlvZbZ/37zKEGPJTdRSZLH08QsJhCu GNnuxSRlHn71zGN6FcbuOhvb0/DS3dNHW5hWlzOHxTNqG0feoqTiDLYlMQn9m5FtbaNTwY tbzWpSA43iF+w/7ug8DSZdP24UJXvfcVnkbJwjKNjeqRYulCd3QYB5b0q1I6kdFtDw2fNA 3Zw+kLnKwLylLGs8dsS1iHOmIUXbt9Db+YFRf7lb+ZDeyTIEwtcoyJ1m2l4Cpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708891880; a=rsa-sha256; cv=none; b=nNgyy8o2/0JWbsmZDzV6PQH4dOHVQOTUa+pQDxLysllHaRb78JdS/mw549nr2UgGvGIQm3 c7QGKkp1vAUyFaw8S56B9J57HeBOqBLUZgkob7u3ZpF3enI7PK2ExQfpnnTslF8dELP7bm pODJ8PrqCipy+tOQojOkOB7g1sXWbd9sBHhWq8Yamg/ki96s5LO4KUOZ4jBLI3lbyI9Y7R 33DZ9FN4z/vKgPXnWOz4/MZJENhWlbcPQGe5g8znSMjx1MEw5MDRYPrLZHdxZoidDmS5Kb 4hGnp3sAWtzA/5ftEDedlE0E+Vufc2vtF8kQfz6KLTNNWNFHUojNOjtZYXD7dw== 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=1708891880; 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=1kycC4paELwmr0qieUKtgqFKZKOx51+l8m2LjGEflzc=; b=Ag2+JNRPha9TWgL4pmNeMD4MkP4qIvAsRSl33mUoPp1nwopAH9z8UOHrHxnsYsKzwigHU+ 4hxrVapQa7Fgeq8dQOLAI/pG3dWOlJMLj/eHO/NbNsJB6Z6+xvQJrRnt8mzoWxjOPw5duT apPG50TaSFc1jvrdL2a0TVRgpOP4/LQmKkus4wdXfhDC6ALoz3n9xiS1fj4TG+M7svCKBu cqTUFu5BIKgjPQP5xIE0geHw3ArFocyVZ7K0P7u1zR/D0rGxKZcPiXrn8jNYIZdUgC3jCg 8o0rs8lD6pnYnwst1BIIKl/xoZzNyBnyPUWKvsZCtVdYi5Q1yG2axo9hPGSVCw== 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 4TjZdN5f5HzyNf; Sun, 25 Feb 2024 20:11:20 +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 41PKBKHE051461; Sun, 25 Feb 2024 20:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PKBKu6051458; Sun, 25 Feb 2024 20:11:20 GMT (envelope-from git) Date: Sun, 25 Feb 2024 20:11:20 GMT Message-Id: <202402252011.41PKBKu6051458@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: 6166c62620dc - main - www/chromium: unbreak build on i386 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: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6166c62620dcd2a760e4306bd8a33716cdfb6bb0 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6166c62620dcd2a760e4306bd8a33716cdfb6bb0 commit 6166c62620dcd2a760e4306bd8a33716cdfb6bb0 Author: Robert Nagy AuthorDate: 2024-02-25 20:11:00 +0000 Commit: Robert Nagy CommitDate: 2024-02-25 20:11:15 +0000 www/chromium: unbreak build on i386 --- ...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