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: d0fcbd9722
Signed-off-by: Florian Schmaus <flow@gentoo.org>
This commit is contained in:
Florian Schmaus
2024-06-19 20:51:57 +02:00
parent 60e7db67b0
commit f472da4099
2 changed files with 4 additions and 42 deletions

View File

@@ -1,40 +0,0 @@
From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001
From: Christopher Fore <csfore@posteo.net>
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 <csfore@posteo.net>
---
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) {

View File

@@ -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() {