Date: Wed, 15 Mar 2023 17:37:53 GMT From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b9452f5c1460 - main - audio/xwave: fix build Message-ID: <202303151737.32FHbrJD039616@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9452f5c1460ff776391db8ce37ec335f17522c5 commit b9452f5c1460ff776391db8ce37ec335f17522c5 Author: Martin Kraft <a0516@marimga.de> AuthorDate: 2023-03-15 12:11:43 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2023-03-15 17:33:26 +0000 audio/xwave: fix build The problem is an implicit type conversion: StrToPmap.c:143:19: error: incompatible pointer to integer conversion assigning to 'XrmName' (aka 'int') from 'void *' [-Wint-conversion] xrm_name[1] = NULL; PR: 270150 Reported by: a0516@marimga.de (maintainer) --- audio/xwave/files/patch-FWF_StrToPmap | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/audio/xwave/files/patch-FWF_StrToPmap b/audio/xwave/files/patch-FWF_StrToPmap new file mode 100644 index 000000000000..db88c0629ad6 --- /dev/null +++ b/audio/xwave/files/patch-FWF_StrToPmap @@ -0,0 +1,16 @@ +--- FWF/src/converters/StrToPmap.c.orig 1998-11-09 00:22:54.000000000 +0100 ++++ FWF/src/converters/StrToPmap.c 2023-03-12 08:38:29.924468000 +0100 +@@ -140,9 +140,11 @@ + XrmValue value; + + xrm_name[0] = XrmStringToName ("pixmapFilePath"); +- xrm_name[1] = NULL; ++ xrm_name[1] = 0; // Replaced NULL by 0. ++ // XrmName/XrmQuark is of type int. M. Kraft 2023-03-12 + xrm_class[0] = XrmStringToClass ("PixmapFilePath"); +- xrm_class[1] = NULL; ++ xrm_class[1] = 0; // Replaced NULL by 0. ++ // XrmName/XrmQuark is of type int. M. Kraft 2023-03-12 + if (!XrmGetDatabase(dpy)) { + (void) XGetDefault (dpy, "", ""); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303151737.32FHbrJD039616>