Date: Tue, 14 Feb 2023 10:49:08 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d187b7420bb8 - main - devel/z88dk: correct the previous build fix (mea culpa) Message-ID: <202302141049.31EAn8Do028940@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d187b7420bb857497674f7a488a25324cdac277d commit d187b7420bb857497674f7a488a25324cdac277d Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-02-14 10:48:40 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-02-14 10:48:40 +0000 devel/z88dk: correct the previous build fix (mea culpa) Type mismatch was caused by the missing structure field, not that `patchdata' is `int', it is `char *' actually. --- devel/z88dk/Makefile | 2 -- devel/z88dk/files/patch-src_appmake_zxn.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/devel/z88dk/Makefile b/devel/z88dk/Makefile index d3c7721603bd..5e5973549ad6 100644 --- a/devel/z88dk/Makefile +++ b/devel/z88dk/Makefile @@ -56,8 +56,6 @@ post-patch: @${REINPLACE_CMD} -e '/^CFLAGS =/s,$$, -I../../../include,' \ ${WRKSRC}/test/suites/make.config # Fix the build against Clang 15 - @${REINPLACE_CMD} -e '/patchdata/s,NULL,0,' \ - ${WRKSRC}/src/appmake/zxn.c @${REINPLACE_CMD} -e '/, ifs/s,move,std::&,' \ ${WRKSRC}/src/z80asm/src/cpp/preproc.cpp diff --git a/devel/z88dk/files/patch-src_appmake_zxn.c b/devel/z88dk/files/patch-src_appmake_zxn.c new file mode 100644 index 000000000000..79eb540aa803 --- /dev/null +++ b/devel/z88dk/files/patch-src_appmake_zxn.c @@ -0,0 +1,10 @@ +--- src/appmake/zxn.c.orig 2020-08-15 03:00:06 UTC ++++ src/appmake/zxn.c +@@ -31,6 +31,7 @@ static struct zx_tape zxt = { + NULL, // merge + -1, // patchpos + -1, // clear_address ++ -1, // usr_address + NULL, // patchdata + NULL, // screen + 0, // audio
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302141049.31EAn8Do028940>