From nobody Tue Feb 14 10:49:08 2023 X-Original-To: dev-commits-ports-all@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 4PGHyD34Vmz3rXc4; Tue, 14 Feb 2023 10:49:08 +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 4PGHyD2Wvxz3mMg; Tue, 14 Feb 2023 10:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676371748; 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=nkCP2i8h7Ftz60hoJ9tzri5pOx7IXOzBXSKJU7UPEfs=; b=tNNcW5l8iuDnlAWCYl0VWuCvyPdj9TRvSXhdv9r9lFVrza6On3fM4cUrQIL0NyBTGVhgG+ ZJJrpEOugFB9NSJWUdRp/Sxmhq72WWkEw4tLhd9vN/qL9exV079fCHRmcTJ+Iah5y6BMnL 9X6oozG2orIKdjemg28uweiHjlPg0qawEUE80VhnDr76fkFdaVyct1Esqy+koHCBC8zEp5 afR8+euA7gK86cl9AfipXDk+cjQKt1VmfjDfMDrjqa/1GkTTVkVoSJPVf67yrix0lF91k+ 88phvvKnBvVXaU2FMVztH++ireRv5APqAgEl/A+DKnPoYi+6rzEHcd/wp65A6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676371748; 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=nkCP2i8h7Ftz60hoJ9tzri5pOx7IXOzBXSKJU7UPEfs=; b=F5SnbZiYZulWvgI0dtlz2fauINL4Bkwp6SWRSb6pK5SciFxakgjY7I8eMtBAum1BvTslQb u5lqSZP1TaSasgdB3S16tTijLWHvBhKfrl9RGJIWj6I8HkQj39z3akkxPwWmPCCnR9ipZJ dWbWc1/gH2LThUGcfMYVN9ZLgJD31sYKyu6IM88EzGlH0HsxqLFar8C+1/fGQc1wlwvuwY uIZBlVTrUqp0e6cNGn6xeENBIWBvcwILdSHoaImuJO4xDSkDrq8hBgM703+DthXDEUhMYz sO9e4+P9LNvP9nKgi/w3BAbd6d2x+U9pIY7sZesVoPjYJO5K+D2wpkxN7WrEbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676371748; a=rsa-sha256; cv=none; b=nSsA/JGresV8znuW+PqAWHH78qBq/GV0rtD4bMAlCq15S916VaSWO5161jkBF5wBoEonbU 1SqNjiwHV0jlVuQjmK/wlmgKO9y9PwsjNfjtiY07Xlby/1w48T6ioS9rgwiub9tDBuUc3v EDwJxRxR7oY0JtW/n+YPg7cgo4WtwuLlwNEoYVXkv9egkHNM1ZsdCbx+JdDFZS1jozMAC6 sgO2Lx9p74skzlof4hbDA/7gEH+woLb3g5xhqKNyLydekALjEQ2w10v38Zp/KrnwTuJtQd iblsqfTHUv2pt9kinoDPz2wSIoa0SgdPW1vJpmAZO+qYE1EdKkHykftaDfMN5A== 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 4PGHyD1bKSzwHS; Tue, 14 Feb 2023 10:49:08 +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 31EAn8Sv028941; Tue, 14 Feb 2023 10:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EAn8Do028940; Tue, 14 Feb 2023 10:49:08 GMT (envelope-from git) Date: Tue, 14 Feb 2023 10:49:08 GMT Message-Id: <202302141049.31EAn8Do028940@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d187b7420bb8 - main - devel/z88dk: correct the previous build fix (mea culpa) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d187b7420bb857497674f7a488a25324cdac277d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d187b7420bb857497674f7a488a25324cdac277d commit d187b7420bb857497674f7a488a25324cdac277d Author: Alexey Dokuchaev AuthorDate: 2023-02-14 10:48:40 +0000 Commit: Alexey Dokuchaev 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