From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1721092-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 0E9981582EF
	for <garchives@archives.gentoo.org>; Mon, 24 Feb 2025 00:32:31 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
	(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)
	(No client certificate requested)
	(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 23BEF34301D
	for <garchives@archives.gentoo.org>; Mon, 24 Feb 2025 00:30:50 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id 1CB3E1102B7;
	Mon, 24 Feb 2025 00:30:49 +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) server-digest SHA256)
	(No client certificate requested)
	by bobolink.gentoo.org (Postfix) with ESMTPS id 13E6D1102B7
	for <gentoo-commits@lists.gentoo.org>; Mon, 24 Feb 2025 00:30:49 +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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C02D1342FA1
	for <gentoo-commits@lists.gentoo.org>; Mon, 24 Feb 2025 00:30:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id F3D872741
	for <gentoo-commits@lists.gentoo.org>; Mon, 24 Feb 2025 00:30:46 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1740356990.51cf1825cf0b39de92758c264ec23497367febd3.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild app-office/libreoffice/libreoffice-24.2.7.2.ebuild
X-VCS-Directories: app-office/libreoffice/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 51cf1825cf0b39de92758c264ec23497367febd3
X-VCS-Branch: master
Date: Mon, 24 Feb 2025 00:30:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4407a73c-6f6f-47e1-b69e-2b7289bd2430
X-Archives-Hash: 0b5627899477aa7550d51d25c5287312

commit:     51cf1825cf0b39de92758c264ec23497367febd3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 00:29:50 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 00:29:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51cf1825

app-office/libreoffice: backport filter-lto to stable too

Bug: https://bugs.gentoo.org/916435
Closes: https://bugs.gentoo.org/950174
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild | 7 ++++---
 app-office/libreoffice/libreoffice-24.2.7.2.ebuild    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
index b1e492d38a7f..855a2250d08e 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2-r1.ebuild
@@ -412,9 +412,6 @@ src_configure() {
 		RANLIB=llvm-ranlib
 		LDFLAGS+=" -fuse-ld=lld"
 
-		# Workaround for bug #907905
-		filter-lto
-
 		# Not implemented by Clang, bug #903889
 		filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
 	else
@@ -431,6 +428,10 @@ src_configure() {
 		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
 	fi
 
+	# ODR violations (not just in skia/vulkan): bug #916435
+	# Runtime crashes with Clang: bug #907905
+	filter-lto
+
 	if use custom-cflags ; then
 		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
 		elog "the build succeeds. Good luck!"

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
index 1d23a5c8bf96..55225b6e3690 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
@@ -442,9 +442,6 @@ src_configure() {
 		RANLIB=llvm-ranlib
 		LDFLAGS+=" -fuse-ld=lld"
 
-		# Workaround for bug #907905
-		filter-lto
-
 		# Not implemented by Clang, bug #903889
 		filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
 	else
@@ -461,6 +458,10 @@ src_configure() {
 		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
 	fi
 
+	# ODR violations (not just in skia/vulkan): bug #916435
+	# Runtime crashes with Clang: bug #907905
+	filter-lto
+
 	if use custom-cflags ; then
 		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
 		elog "the build succeeds. Good luck!"