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 <csfore@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/35546
Signed-off-by: Florian Schmaus <flow@gentoo.org>

2 files changed, 45 insertions, 1 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
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 <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, (_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
 }