From nobody Wed Mar 15 17:37:53 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PcHfV2Qntz3xYF2; Wed, 15 Mar 2023 17:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PcHfV1ZfGz3NvC; Wed, 15 Mar 2023 17:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678901874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2czeIIXR8zRQzBfIjN6KLgoXRkfIti6y5cFd+MBpLxc=; b=BIhlV2O25a49ls/rjJOc7JVZgaWp9psNVyaIIigDI5AO50Z9E5+w3lqfH6WTI05aOnwJBr Pf63Gz7cI26xAWUw8qDSfBaOS4TDao1o/eskbAr2FHyoudVU1G1/75ZNPQTkwM2AdIKQtD t8mP/p3zmesiIlunDF8hB4A+SkEqVaUKNqcXRI/qdZkCCRJS3W82J+XoouPBTCNMHNEpzy BdNDJu+ig/TYwdOLkyhGtCKCyJoL+6caUln7EeK7jeiUrgxfWbFLvfZem9M4GiHrAwyyE4 jJg7LiIzmoJh6mHUvDO6psCPTnJLdQnbTVfcvprGBY1G8oypEMKajEY3k4LzrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678901874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2czeIIXR8zRQzBfIjN6KLgoXRkfIti6y5cFd+MBpLxc=; b=kcMOhSUnnIhfhNbzaoq/+Y2KIkpZgzchdBGrfZ/4dThS0Ek3fAgI3TBoU7rUh+kiiHwVYb axwHPUcZXDPf1oflPO6+tGWJVABaHenMpMFIwBCAZwPL/f9MHu37DcwHEZkvaE4+Haxuli XvylRwQ4ZQmSKngH4woMX1cKpwxoNdCUsXyWjtxrL+Ri2TMpRawHaxzx5vNJSuorsbnc7v ykfKOF8xRKr+KXQk78BK7BMVR+ieNGNOGPU81mP055b8Rj5hdnluNyol2G5T76KaUOqwnp YFA9KYLejCsP7dNyEzYDKDQ0G88ofS7VL4Dwx4qxEypxINWUmGQDr6G1NggobA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678901874; a=rsa-sha256; cv=none; b=P9D3oKu0ROQjQJJr2hwswtBymYUDGaepmRWLENl7HY2bDDWObCw9c5f37X5KPQJgp0zmAp YZubesR434Clk27E1fUt6GyTIEcVfIsQ+Nc513rQlIcvQp5BCUHYBLL8zP75hevxNH1rxH sr0/VjMqyuZKA6gyPj3kglJuLN94Gy/jRNz4EuzDv+qfnydb4MRVqlgsG3WmWQjdji8kv3 QZE7hxcsXvEb+SciaFRQyxkNaaiMrpMrWl7rzXLfhUFae0yqjEya1qPhBDtaVnwH0iWYD3 0CSFJ4htMpH173AA3uon8MWAukDQtsMnI3F3KYNH5HTa/oJM8BY926MiGSYgxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PcHfV0cKjz1Q9Z; Wed, 15 Mar 2023 17:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32FHbrLN039617; Wed, 15 Mar 2023 17:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32FHbrJD039616; Wed, 15 Mar 2023 17:37:53 GMT (envelope-from git) Date: Wed, 15 Mar 2023 17:37:53 GMT Message-Id: <202303151737.32FHbrJD039616@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: b9452f5c1460 - main - audio/xwave: fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9452f5c1460ff776391db8ce37ec335f17522c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9452f5c1460ff776391db8ce37ec335f17522c5 commit b9452f5c1460ff776391db8ce37ec335f17522c5 Author: Martin Kraft AuthorDate: 2023-03-15 12:11:43 +0000 Commit: Fernando Apesteguía 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, "", ""); + }