From nobody Mon Feb 27 18:19:06 2023 X-Original-To: dev-commits-ports-branches@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 4PQTKQ3XWZz3vRQj; Mon, 27 Feb 2023 18:19:06 +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 4PQTKQ1tGJz3xwS; Mon, 27 Feb 2023 18:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521946; 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=zS7Y2VIF3iyMQKaXY2Mlhvi4C3I6piBSd8R+rdNqm30=; b=N6XowCQgFTalmJiBNfW7bKk4cM91Xd8AAE7DWGFZ6Ci21LJDa6cAlxJ7IlmmS8+v3qUeN2 N6T6RTR5r191K8fVdHfOUHnI/I+Me3Rk0oer4+xLksT1mMNCSFw7XrSjhi/oRsP11yaFoE e2c6u/ZhF04R5mnaU6PMo0LdtQ/lEMOWy8uPtx+X3GfEnIfGeq/0454c+kp4h6xID0OEUx R+mj+o15Vk4cb+wibRza83oDEbUvbE51U0fLTq5M7oz+UfplwtxUfgdjK+YnvQ6ldga8r6 sI5aLi5Y41brD+NuXhC6uhPrZyhW25opn/16uBSVMYtcFzjks0gnPc60J+Arug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677521946; 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=zS7Y2VIF3iyMQKaXY2Mlhvi4C3I6piBSd8R+rdNqm30=; b=B0q8JSivhqILCasVqNtEAF9zr2iG7ZV+C8yYfGK5DLzr8r8aISgDDtEpLxLpQD2b5D5Nuo rmPLuKKsPAdiWffnOS0kfIE//mucJKbKaIZlRHxXrEO+qA8ZLwdsIkAQaANh8dNYNfpAst YZaJCNcVes7DzSqa3pxuUjFu9t7qWXOkFwY0/CGH9o1FN+yg76CDvyYVmJ7e9StNe7vIan nYicpDY+dyfVVYV5F14nShZ3Srv7UhcBd4g3aYIpsCyQh8N2pZyEB7T4HX8Pk9O9UrRRtq KSsZe5LZYWYsv9xNzd6evh42wSw2MswiLUg0IZwhfRpRZjOOasnpWE1VC3rF8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677521946; a=rsa-sha256; cv=none; b=hq4c/Y2DWhPJf9HOOLKNlnjsD7U/e8OHL4Y+0GOzyrK9XIfokZznH67nXAuH69avV192/C 1g1eGQbnhmw+E8j8vP20XiDMhPNim3o1eU3eLCJ+HyxzAFrxkweEuIlx9WzjA/Mg+mxbgy fNjy+R+s19tTokVZQphCnUl6TSVyOXCdXyHwRlUOzVPVt8rmhgNAa5XlNs7IfexIZFzore JmtH+9B0ueFYNCNP5ERtE6EC8ZKMgk2w3q1fqL5lbRC6h7tbWPJ1bM5CHsm6sNdQ/aqk9K riBRcs6M2A3NOxwagFHFLdZ5KTeVjKNarJDtpiMx1UaOSR1eV9C1EOq+oaL3xQ== 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 4PQTKQ0xsrzbc1; Mon, 27 Feb 2023 18:19:06 +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 31RIJ62R034598; Mon, 27 Feb 2023 18:19:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIJ6Oe034597; Mon, 27 Feb 2023 18:19:06 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:19:06 GMT Message-Id: <202302271819.31RIJ6Oe034597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: bbd5b6c7dc5e - 2023Q1 - emulators/xsystem35: unbreak build with clang 15 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: bbd5b6c7dc5e9f6ce9c9ccfdb742c1de78a5e560 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbd5b6c7dc5e9f6ce9c9ccfdb742c1de78a5e560 commit bbd5b6c7dc5e9f6ce9c9ccfdb742c1de78a5e560 Author: Jan Beich AuthorDate: 2023-02-11 11:57:32 +0000 Commit: Jan Beich CommitDate: 2023-02-27 18:18:27 +0000 emulators/xsystem35: unbreak build with clang 15 nDEMO.c:22:6: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'int *'; dereference with * [-Wint-conversion] int p1 = getCaliVariable(); ^ ~~~~~~~~~~~~~~~~~ * nDEMO.c:28:6: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'int *'; dereference with * [-Wint-conversion] int p1 = getCaliVariable(); ^ ~~~~~~~~~~~~~~~~~ * nt_msg.c:189:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *b = sjis2euc(msg); ^ ~~~~~~~~~~~~~ nt_msg.c:261:10: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *b = sjis2euc(mbuf); ^ ~~~~~~~~~~~~~~ sactcg.c:211:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *b = sjis2euc(cText); ^ ~~~~~~~~~~~~~~~ Reported by: pkg-fallout (cherry picked from commit 3968779d8b3bc78928f508f2d90a9f30eb633f32) --- emulators/xsystem35/Makefile | 2 +- emulators/xsystem35/files/patch-clang15 | 61 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index a4c83ce19edf..45cf6222a739 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -1,6 +1,6 @@ PORTNAME= xsystem35 DISTVERSION= 1.7.3-pre5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators games MASTER_SITES= DEBIAN DISTFILES= ${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX} diff --git a/emulators/xsystem35/files/patch-clang15 b/emulators/xsystem35/files/patch-clang15 new file mode 100644 index 000000000000..6e167ce3e9ac --- /dev/null +++ b/emulators/xsystem35/files/patch-clang15 @@ -0,0 +1,61 @@ +Get value instead of pointer in Set*Flag() like other modules + +nDEMO.c:22:6: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'int *'; dereference with * [-Wint-conversion] + int p1 = getCaliVariable(); + ^ ~~~~~~~~~~~~~~~~~ + * +nDEMO.c:28:6: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'int *'; dereference with * [-Wint-conversion] + int p1 = getCaliVariable(); + ^ ~~~~~~~~~~~~~~~~~ + * + +Avoid implicit function declaration for sjis2euc() + +nt_msg.c:189:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] + char *b = sjis2euc(msg); + ^ ~~~~~~~~~~~~~ +nt_msg.c:261:10: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] + char *b = sjis2euc(mbuf); + ^ ~~~~~~~~~~~~~~ +sactcg.c:211:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] + char *b = sjis2euc(cText); + ^ ~~~~~~~~~~~~~~~ + +--- modules/NIGHTDLL/nt_msg.c.orig 2003-11-09 15:06:12 UTC ++++ modules/NIGHTDLL/nt_msg.c +@@ -18,6 +18,7 @@ + #include "sactcg.h" + #include "sjisname.h" + #include "sactstring.h" ++#include "eucsjis.h" + + + extern int ntsel_dosel(void); +--- modules/NIGHTDLL/sactcg.c.orig 2003-11-16 15:29:52 UTC ++++ modules/NIGHTDLL/sactcg.c +@@ -34,6 +34,7 @@ + #include "ags.h" + #include "surface.h" + #include "ngraph.h" ++#include "eucsjis.h" + #include "sactcg.h" + + #define CGMAX 65536 +--- modules/nDEMO/nDEMO.c.orig 2001-07-30 22:58:40 UTC ++++ modules/nDEMO/nDEMO.c +@@ -19,13 +19,13 @@ void SetKeyCancelFlag() { + } + + void SetKeyCancelFlag() { +- int p1 = getCaliVariable(); ++ int p1 = getCaliValue(); + + DEBUG_COMMAND_YET("nDEMO.SetKeyCancelFlag %d:\n", p1); + } + + void SetLoopFlag() { +- int p1 = getCaliVariable(); ++ int p1 = getCaliValue(); + + DEBUG_COMMAND_YET("nDEMO.SetLoopFlag %d:\n", p1); + }