From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E59CB15ACFB for ; Fri, 14 Apr 2023 15:57:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BCFFE078A; Fri, 14 Apr 2023 15:57:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E3B5E078A for ; Fri, 14 Apr 2023 15:57:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F390833B864 for ; Fri, 14 Apr 2023 15:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9251C108 for ; Fri, 14 Apr 2023 15:57:00 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1681487783.23e62bcc9a854f4b988709b2a1e1baf2ca521cbe.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-112.0.5615.49.ebuild www-client/chromium/files/chromium-112-sql-relax.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 23e62bcc9a854f4b988709b2a1e1baf2ca521cbe X-VCS-Branch: master Date: Fri, 14 Apr 2023 15:57:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3b073f3-8da4-42e6-8eb9-fbb4102d8426 X-Archives-Hash: 1d3bf03cca7830b40b46c6cc6ddd0ca7 commit: 23e62bcc9a854f4b988709b2a1e1baf2ca521cbe Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 14 15:55:58 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 14 15:56:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e62bcc www-client/chromium: add patch for clang-16 compat Signed-off-by: Mike Gilbert gentoo.org> www-client/chromium/chromium-112.0.5615.49.ebuild | 1 + .../chromium/files/chromium-112-sql-relax.patch | 46 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/www-client/chromium/chromium-112.0.5615.49.ebuild b/www-client/chromium/chromium-112.0.5615.49.ebuild index a0663b22f3f0..0c39b812a76f 100644 --- a/www-client/chromium/chromium-112.0.5615.49.ebuild +++ b/www-client/chromium/chromium-112.0.5615.49.ebuild @@ -340,6 +340,7 @@ src_prepare() { "${FILESDIR}/chromium-112-compiler.patch" "${FILESDIR}/chromium-112-libstdc++.patch" "${FILESDIR}/chromium-112-libstdc++-1.patch" + "${FILESDIR}/chromium-112-sql-relax.patch" ) if use ppc64 ; then diff --git a/www-client/chromium/files/chromium-112-sql-relax.patch b/www-client/chromium/files/chromium-112-sql-relax.patch new file mode 100644 index 000000000000..2510d1000034 --- /dev/null +++ b/www-client/chromium/files/chromium-112-sql-relax.patch @@ -0,0 +1,46 @@ +From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001 +From: Elly Fong-Jones +Date: Thu, 02 Mar 2023 00:15:11 +0000 +Subject: [PATCH] sql: relax constraints on VirtualCursor layout + +VirtualCursor::FromSqliteCursor required that VirtualCursor had a +standard layout, but in fact VirtualCursor shouldn't have a standard +layout, and the fact that it does with libc++ is a deviation from the +C++ standard. This change: + +1. Relaxes the requirement that VirtualCursor has a standard layout, and +2. Relaxes the requirement that the sqlite_cursor_ field has to be at + offset 0 + +by use of offsetof() and pointer subtraction. This change both improves +standards compliance and makes this code build with libstdc++. + +Bug: 1380656 +Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313 +Reviewed-by: Austin Sullivan +Commit-Queue: Elly Fong-Jones +Cr-Commit-Position: refs/heads/main@{#1111925} +--- + +diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h +index 1970bdca..4cb0655 100644 +--- a/sql/recover_module/cursor.h ++++ b/sql/recover_module/cursor.h +@@ -63,12 +63,10 @@ + // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor(). + static inline VirtualCursor* FromSqliteCursor( + sqlite3_vtab_cursor* sqlite_cursor) { +- static_assert(std::is_standard_layout::value, +- "needed for the reinterpret_cast below"); +- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0, +- "sqlite_cursor_ must be the first member of the class"); +- VirtualCursor* result = reinterpret_cast(sqlite_cursor); +- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_); ++ VirtualCursor* result = reinterpret_cast( ++ (reinterpret_cast(sqlite_cursor) - ++ offsetof(VirtualCursor, sqlite_cursor_))); ++ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_); + return result; + } +