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 83442158043 for ; Tue, 16 Apr 2024 19:14:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87AF0E2A03; Tue, 16 Apr 2024 19:14:01 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 5CC42E2A03 for ; Tue, 16 Apr 2024 19:14:01 +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 3A5EF3433F8 for ; Tue, 16 Apr 2024 19:14:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74CA416B9 for ; Tue, 16 Apr 2024 19:13:58 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1713294836.d9a4a5917f2c0d2eb0f9b8232d17cc2ccf2884a9.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/aseprite/aseprite-1.3.5.ebuild X-VCS-Directories: dev-games/aseprite/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: d9a4a5917f2c0d2eb0f9b8232d17cc2ccf2884a9 X-VCS-Branch: master Date: Tue, 16 Apr 2024 19:13:58 +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: 80a0955c-e6c7-451d-9a69-4f3c9380279b X-Archives-Hash: 4f557b58005601ae7eeae8da9d86a19a commit: d9a4a5917f2c0d2eb0f9b8232d17cc2ccf2884a9 Author: Joonas Niilola gentoo org> AuthorDate: Tue Apr 16 19:07:41 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Apr 16 19:13:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a4a591 dev-games/aseprite: sync filter-lto fix to 1.3.5 - originally made in 95f26136eef6b81d752e4ddf102934306f69c581. Closes: https://github.com/gentoo/gentoo/pull/35619 Co-authored-by: Eli Schwartz gmail.com> Signed-off-by: Joonas Niilola gentoo.org> dev-games/aseprite/aseprite-1.3.5.ebuild | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dev-games/aseprite/aseprite-1.3.5.ebuild b/dev-games/aseprite/aseprite-1.3.5.ebuild index fbbe0ad3e3a5..8717c09abd5e 100644 --- a/dev-games/aseprite/aseprite-1.3.5.ebuild +++ b/dev-games/aseprite/aseprite-1.3.5.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake desktop python-any-r1 toolchain-funcs xdg-utils +inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg-utils SKIA_VER="m102" # Last commit in ${SKIA_VER} feature branch @@ -78,7 +78,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.2.35_laf_fixes.patch" "${FILESDIR}/${PN}-1.3.2_shared_fmt.patch" "${FILESDIR}/${PN}-1.3.2_strict-aliasing.patch" - "${FILESDIR}/${PN}-1.3.5_laf-strict-aliasing.patch" + "${FILESDIR}"/aseprite-1.3.5_laf-strict-aliasing.patch ) src_prepare() { @@ -97,6 +97,19 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/924692 + # https://github.com/aseprite/aseprite/issues/4413 + # + # There is a bundled skia that fails with ODR errors. When excluding just + # skia from testing, aseprite itself failed with strict-aliasing (before + # upstream PR#84), and when that is disabled, fails again with ODR and + # lto-type-mismatch issues. + # + # There are a lot of issues, so don't trust any fixes without thorough + # testing. + filter-lto + einfo "Skia configuration" cd "${WORKDIR}/skia-${SKIA_REV}" || die