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 CFE71158020 for ; Sat, 3 Dec 2022 06:06:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A9FFE0E9A; Sat, 3 Dec 2022 06:06:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 04654E0E9A for ; Sat, 3 Dec 2022 06:06:26 +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 EB5F1340DCA for ; Sat, 3 Dec 2022 06:06:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98A3677F for ; Sat, 3 Dec 2022 06:06:22 +0000 (UTC) From: "Sam James" 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" Message-ID: <1670047569.a761f21ace81b036dce7d80416a33a2b3e9685c5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/dia/, app-office/dia/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/dia/dia-0.97.3-r1.ebuild app-office/dia/files/dia-0.97.3-configure-clang16.patch X-VCS-Directories: app-office/dia/files/ app-office/dia/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a761f21ace81b036dce7d80416a33a2b3e9685c5 X-VCS-Branch: master Date: Sat, 3 Dec 2022 06:06:22 +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: 27daadd3-6e03-4b33-beba-6cfdde8f090e X-Archives-Hash: b529a0c6c118f8ca4b1a7a08133d320b commit: a761f21ace81b036dce7d80416a33a2b3e9685c5 Author: Sam James gentoo org> AuthorDate: Sat Dec 3 05:30:46 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 3 06:06:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a761f21a app-office/dia: fix build w/ clang 16 Closes: https://bugs.gentoo.org/874729 Signed-off-by: Sam James gentoo.org> app-office/dia/dia-0.97.3-r1.ebuild | 3 ++- .../dia/files/dia-0.97.3-configure-clang16.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild index 7b6401a9959c..1a963358eaaf 100644 --- a/app-office/dia/dia-0.97.3-r1.ebuild +++ b/app-office/dia/dia-0.97.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,6 +46,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 "${FILESDIR}"/${PN}-0.97.3-slibtool.patch + "${FILESDIR}"/${PN}-0.97.3-configure-clang16.patch ) src_prepare() { diff --git a/app-office/dia/files/dia-0.97.3-configure-clang16.patch b/app-office/dia/files/dia-0.97.3-configure-clang16.patch new file mode 100644 index 000000000000..75b6f003ca3f --- /dev/null +++ b/app-office/dia/files/dia-0.97.3-configure-clang16.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/874729 +https://src.fedoraproject.org/rpms/dia/blob/0a14169fc36b959598074065678e0126830317f8/f/dia-configure-c99.patch + +C99 removes support for implicit ints, so declare the return type +of main explicitly. Future compilers are likely to require explicit +type declarations. + +Upstream has switched to Meson, and it does not seem to use this +particular check anymore. + +--- a/configure.in ++++ b/configure.in +@@ -197,7 +197,7 @@ if test "$png_ok" = yes; then + png_structp pp; + png_infop info; + png_colorp cmap; +- main() { void*foo = png_create_read_struct; }], ++ int main(void) { void*foo = png_create_read_struct; }], + png_ok=yes, + png_ok=no) + LDFLAGS="${old_LDFLAGS}" +