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

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

[Ionen Wolkens]

commit:     916f6b97fc1ea3d7c8539a3c740460f602591237
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 05:03:20 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 05:09:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916f6b97

x11-misc/xkeycaps: further fix w/ upcoming clang16

When last tested this package, did not know clang16 was newly enabling
-Werror=incompatible-pointer-types yet and hadn't looked at this.

Trivial const mismatch, so no revbump.

Bug: https://bugs.gentoo.org/871129
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch | 18 ++++++++++++++++++
 x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild              |  1 +
 2 files changed, 19 insertions(+)

diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
new file mode 100644
index 000000000000..99dc6f4ea827
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/871129
+--- a/commands.c
++++ b/commands.c
+@@ -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);
+ }
+@@ -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);
+   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);
+   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 be540734790a..136ec95c516f 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
 PATCHES=(
 	"${FILESDIR}"/${P/_p*}-Imakefile.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 S=${WORKDIR}/${P/_p*}
 

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

[Miroslav Šulc]

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 $(