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

[Ionen Wolkens]

commit:     1c0bcea858a457034445af16010899e97f0d55fb
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:24:43 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0bcea8

x11-misc/xsnap: fix build with clang

Includes fix specific to >=clang16 too.

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

 x11-misc/xsnap/files/xsnap-1.5.15-clang.patch | 17 +++++++++++++++++
 x11-misc/xsnap/xsnap-1.5.15-r2.ebuild         |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch
new file mode 100644
index 000000000000..9b51bcb33e5b
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/870811
+--- a/xsnap.c
++++ b/xsnap.c
+@@ -150,2 +150,3 @@
+ Window win;
++int init_cursor;
+ {
+@@ -1706,3 +1707,3 @@
+    static Window win0 = None;
+-   static w0 = 0, h0 = 0;
++   static int w0 = 0, h0 = 0;
+    int i, j, d, w, h;
+@@ -2254,3 +2255,3 @@
+ 	if (op_mode == 0)
+-	    exitXsnap (NULL, NULL, snap_pixmap, copy_gc);
++	    exitXsnap ((Window)0, (Window)0, snap_pixmap, copy_gc);
+ 

diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
index bc17eb259842..e93eb8f85a7d 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
@@ -34,8 +34,13 @@ BDEPEND="
 	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1
 "
+
 DOCS=( AUTHORS Changelog README )
-PATCHES=( "${FILESDIR}"/${P}-root_name.patch )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-root_name.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_prepare() {
 	default