git: cdcba986e979 - 2023Q2 - graphics/xwpick: Fix LLVM15 build

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 29 May 2023 15:03:03 UTC
The branch 2023Q2 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cdcba986e979dca475e96a074367abbee864cc79

commit cdcba986e979dca475e96a074367abbee864cc79
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-05-25 14:51:39 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-05-29 15:02:54 +0000

    graphics/xwpick: Fix LLVM15 build
    
    Fix the following error:
    
    ImgToolKit.c:272:10: error: incompatible pointer to integer conversion assigning to 'Atom' (aka 'unsigned long') from 'void *' [-Wint-conversion]
        type = NULL;
             ^ ~~~~
    
    While at it assume maintainership of this unmaintained port.
    
    (cherry picked from commit 53c230b247d1f52f4793c9bdb969303a49ad39ba)
---
 graphics/xwpick/Makefile                 |  2 +-
 graphics/xwpick/files/patch-ImgToolKit.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 9373a9d757f8..3a1f4398a7c5 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	XCONTRIB/applications
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Image pick up utility for X Window System
 
 LICENSE=	xwpick
diff --git a/graphics/xwpick/files/patch-ImgToolKit.c b/graphics/xwpick/files/patch-ImgToolKit.c
new file mode 100644
index 000000000000..4c5a0c311f11
--- /dev/null
+++ b/graphics/xwpick/files/patch-ImgToolKit.c
@@ -0,0 +1,11 @@
+--- ImgToolKit.c.orig	1994-11-02 00:30:07.000000000 -0800
++++ ImgToolKit.c	2023-05-25 07:50:21.577290000 -0700
+@@ -269,7 +269,7 @@
+   curW  = win;
+   state = XInternAtom(theDsp, "WM_STATE", True);
+   if (state != NULL) {
+-    type = NULL;
++    type = 0;
+     kidW = win;
+     while (kidW != NULL) {
+       curW = kidW;