[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/, x11-misc/xkeycaps/files/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     7c650a13afd47a4677ae9d9d03e45cdc74b38ffc
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 09:38:30 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 09:39:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c650a13

x11-misc/xkeycaps: update clang16 patch to provide compatible pointer type  sorted vars

Closes: https://bugs.gentoo.org/928511
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch | 6 +++---
 x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
index 99dc6f4ea827..7abcb27ab43b 100644
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
@@ -4,15 +4,15 @@ https://bugs.gentoo.org/871129
 @@ -1754,3 +1754,3 @@
      }
 -  XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True);
-+  XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0, True);
++  XawListChange (box->keysym_list, (char **) keysym_name_buffer, 0, 0, True);
  }
 @@ -2528,3 +2528,3 @@
    box->set = &keyboard_sets [i];
 -  XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True);
-+  XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0, True);
++  XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True);
    for (i = 0; i < box->set->map_count; i++)
 @@ -2599,3 +2599,3 @@
  
 -  XawListChange (box->keyboard_list, list, 0, 0, True);
-+  XawListChange (box->keyboard_list, (const char **) list, 0, 0, True);
++  XawListChange (box->keyboard_list, (char **) list, 0, 0, True);
    XawListHighlight (box->keyboard_list, kbd);

diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index 136ec95c516f..bb69a6b70dcc 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -11,6 +11,7 @@ SRC_URI="
 	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
 "
 
+S=${WORKDIR}/${P/_p*}
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
@@ -37,7 +38,6 @@ PATCHES=(
 	"${FILESDIR}"/${P/_p*}-Imakefile.patch
 	"${FILESDIR}"/${P}-clang16.patch
 )
-S=${WORKDIR}/${P/_p*}
 
 src_prepare() {
 	eapply $(