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 07C30158043 for ; Tue, 27 Feb 2024 15:18:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D107E2AB4; Tue, 27 Feb 2024 15:18:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 141C4E2AB4 for ; Tue, 27 Feb 2024 15:18:55 +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 4F13233BEEE for ; Tue, 27 Feb 2024 15:18:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98BD01301 for ; Tue, 27 Feb 2024 15:18:52 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1709047024.281631c0ee38b5793bd4bc30e9dcde99905e41b9.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xdvik/files/, app-text/xdvik/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch app-text/xdvik/xdvik-22.87.06-r1.ebuild X-VCS-Directories: app-text/xdvik/files/ app-text/xdvik/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 281631c0ee38b5793bd4bc30e9dcde99905e41b9 X-VCS-Branch: master Date: Tue, 27 Feb 2024 15:18:52 +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: 6022f753-986e-46e0-afdf-5fc7243fdcbc X-Archives-Hash: b5cab4eda7242fec1c20cf8de46714fd commit: 281631c0ee38b5793bd4bc30e9dcde99905e41b9 Author: Christopher Fore posteo net> AuthorDate: Tue Feb 27 02:18:16 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Feb 27 15:17:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281631c0 app-text/xdvik: Fix compilation on GCC 14 - Casts page_info.page_labels to _Xconst char** to correct an incompatible pointer type - Moves patches into an array gui/pagesel.c: In function ‘xaw_update_list’: gui/pagesel.c:541:41: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types] 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0, | ~~~~~~~~~^~~~~~~~~~~~ | | | char ** https://wiki.gentoo.org/wiki/Modern_C_porting Unfortunately upstream rejected the PR due to backwards compatability issues Upstream PR: https://github.com/TeX-Live/texlive-source/pull/64 Mailing List: https://tug.org/pipermail/tex-k/2024-February/004008.html Closes: https://bugs.gentoo.org/919069 Signed-off-by: Christopher Fore posteo.net> Closes: https://github.com/gentoo/gentoo/pull/35546 Signed-off-by: Florian Schmaus gentoo.org> app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch | 40 +++++++++++++++++++++++ app-text/xdvik/xdvik-22.87.06-r1.ebuild | 6 +++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch new file mode 100644 index 000000000000..d22c473f42d3 --- /dev/null +++ b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch @@ -0,0 +1,40 @@ +From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001 +From: Christopher Fore +Date: Thu, 15 Feb 2024 15:20:34 -0500 +Subject: [PATCH] xdvik/gui: Fix compilation on GCC 14 + +Starting in GCC 14, what used to be warnings from incompatible pointer +types are now errors. + +https://www.gnu.org/software/gcc/gcc-14/porting_to.html + +Error message: +gui/pagesel.c:541:41: error: passing argument 2 of `XawListChange' from +incompatible pointer type [-Wincompatible-pointer-types] + 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0, + | ~~~~~~~~~^~~~~~~~~~~~ + | | + | char ** + +This mismatch is simply from XawListChange taking in a const whilst the +argument given was not a const. + +Gentoo bug: https://bugs.gentoo.org/919069 +Signed-off-by: Christopher Fore +--- + texk/xdvik/gui/pagesel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gui/pagesel.c b/gui/pagesel.c +index 945ae760fa..913db11264 100644 +--- a/gui/pagesel.c ++++ b/gui/pagesel.c +@@ -538,7 +538,7 @@ xaw_update_list(void) + button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width); + /* delete and re-create list */ + ASSERT(total_pages <= (int)page_info.index_size, ""); +- XawListChange(LIST_WIDGET, page_info.page_labels, 0, ++ XawListChange(LIST_WIDGET, (_Xconst char**) page_info.page_labels, 0, + MAX(button_width, pagelist_width), False); + /* restore selected item */ + if (idx != XAW_LIST_NONE) { diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild index 42dbb86d80dd..a12b97aef76f 100644 --- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild +++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild @@ -39,6 +39,11 @@ BDEPEND="app-alternatives/lex app-alternatives/yacc virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch + "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch +) + src_prepare() { default @@ -51,7 +56,6 @@ src_prepare() { cd "${WORKDIR}/${P}" || die cd "${S}" || die - eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch eautoreconf }