From nobody Sun Jul 9 08:52:21 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 4QzLVZ0fDsz4m6tP; Sun, 9 Jul 2023 08:52:22 +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 4QzLVZ0DBdz3KL8; Sun, 9 Jul 2023 08:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688892742; 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=4EIEFA8bxMLscNn24CBKc/sNeEQ4dZGbAX8oalxypaQ=; b=txdCKtYaJR2EIWX0s1HAPqI/dR1zNyWiwd+pSP41UXoLdqHI4fU1uXu4PPhcgT7sYsHldd imSLQBLaZALz2ptYz7mrgWHzgmmIKflIvLtQHIK9uey58dGcWrUpE8BD5KJGLbzA4vbTiy 4tg0e18n3x5qEzjX8KHdessaP9caUrP9+u7KBv7tIggb3/BjEEjWmgVMjJHLS/MkeMnBJs mE/DVEvjxrzl73KM8n8+ccvbhqvY3I1gmtwN83X/7hTxejc6mRtX8IXgYSoWCK33zAvfqd cQRSXazyf5SPvSfbT3/iWqrbCwZb8BkNw9tISdLaGmtHZ2KgDZSRpoGURnOw4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688892742; 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=4EIEFA8bxMLscNn24CBKc/sNeEQ4dZGbAX8oalxypaQ=; b=s1py4E/PPUvGnGdXH0/Mmb8NJQRgPd8/RpcVrmK86CYSyiD9vxf8NkBrofOlMjQZm40lQU rKfM9GGqzxvWO9/tPmARCQm4F224NSRfMT0T2i7kbfpyNDZ5wZH+2zbeESUGPE66AAQVeV VT+6cQlWZils3+hJrK6l9721rxF2PIGcTAFG2pkQMbddsRBUra0tjtlP2N+FO7zPJSiHz3 ApkN3LMdRpV7gNNXA3JK0124k5iljcQUm7sWpZOsrVeQab82JNfthlGbc3Nug6rdHKQyqi 4lJ6ZSmz0ZwYPHtjH6LKQBzokdOmfmLOczL4SPLm7M5Dchq5uc0DgLDWcGKQLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688892742; a=rsa-sha256; cv=none; b=KwQgm0szu63QmIJBtuP2a5T9WS0TPfhC+1v6Ss+DZ8ABhf+cTCNPUtXF79pwy46p0A3q/J N5Uiy/lRvRmOkofbt7AB7j6y3Do+T4IkMGjGO24/eihVAMehpKGbbQ2zjKeyRinVL6FLnN HMRbcXxwr95JM9aDbjhx++dLNI0/B69lRFTUv8PhLRiYiSKdBWNty+O8BY2CIafu6T5O5U 4dt7iYsTfdorDI7qNf6B1NsFrX5BgxnQQ+jF9RmtsEtPTmB9h3BDVnzF3MYg5wnz1PyiG+ 9Z8PE9B65eeL+hLgkLHWPO0leP/LLQeQEGciuE2G/ted1T8VoCak7758FueG6A== 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 4QzLVY6NqTzx3H; Sun, 9 Jul 2023 08:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3698qLfx081162; Sun, 9 Jul 2023 08:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3698qLYd081161; Sun, 9 Jul 2023 08:52:21 GMT (envelope-from git) Date: Sun, 9 Jul 2023 08:52:21 GMT Message-Id: <202307090852.3698qLYd081161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 450ca6e2b5bf - 2023Q3 - cad/gds3d: Fix build on 14 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 450ca6e2b5bf54d5f0f45b790ee1289bc5988a94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=450ca6e2b5bf54d5f0f45b790ee1289bc5988a94 commit 450ca6e2b5bf54d5f0f45b790ee1289bc5988a94 Author: Yuri Victorovich AuthorDate: 2023-07-09 08:51:16 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-09 08:52:19 +0000 cad/gds3d: Fix build on 14 Reported by: fallout (cherry picked from commit 1f7d69835af4e7549632661924a236ed091c42cb) --- cad/gds3d/files/patch-manual-gds_globals.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cad/gds3d/files/patch-manual-gds_globals.h b/cad/gds3d/files/patch-manual-gds_globals.h new file mode 100644 index 000000000000..f652a732d58b --- /dev/null +++ b/cad/gds3d/files/patch-manual-gds_globals.h @@ -0,0 +1,17 @@ +- workaround for error: reference to 'byte' is ambiguous, see https://github.com/trilomix/GDS3D/issues/23 + +--- ../libgdsto3d/gds_globals.h.orig 2023-07-09 01:42:32.116154000 -0700 ++++ ../libgdsto3d/gds_globals.h 2023-07-09 01:42:59.001193000 -0700 +@@ -116,9 +116,9 @@ + + typedef struct gds_header{ + short RecordLength; +- byte RecordType; +- byte DataType; +- byte *Data; ++ ::byte RecordType; ++ ::byte DataType; ++ ::byte *Data; + }gds_header; + + /* A word consists of 16 bits, numbered from 0 to 15, left to right. */