commit: f472da40993dc9f1dde7f6f1f4dc5a4d9faec62d Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Wed Jun 19 18:51:57 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Jun 19 18:58:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f472da40
app-text/xdvik: require >=libXaw-1.0.16 Starting with version 1.0.16, libXaw has (again) the expected xaw API for XawListChange [1]. This means we can drop the according patch. 1: https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/d0fcbd9722ad691ca0b5873c98e8e9c236fa718b Signed-off-by: Florian Schmaus <flow <AT> 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, 4 insertions(+), 42 deletions(-) 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 deleted file mode 100644 index 4c16f0abd9c4..000000000000 --- a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001 -From: Christopher Fore <[email protected]> -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 <[email protected]> ---- - 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, (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 b41e96e30510..61fa93f0c7a1 100644 --- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild +++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild @@ -17,6 +17,9 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 IUSE="motif neXt Xaw3d emacs" +# require >=libXaw-1.0.16 for suitable XawListChange API, see +# - https://bugs.gentoo.org/919069 +# - https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/d0fcbd9722ad691ca0b5873c98e8e9c236fa718b DEPEND=">=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi @@ -29,7 +32,7 @@ DEPEND=">=media-libs/freetype-2.9.1-r2:2 neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) + !Xaw3d? ( >=x11-libs/libXaw-1.0.16 ) ) ) dev-libs/kpathsea:=" @@ -42,7 +45,6 @@ BDEPEND="app-alternatives/lex PATCHES=( "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch - "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch ) src_prepare() {
