From nobody Sun Jul 09 08:52:00 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 4QzLV86BMwz4m6ql; Sun, 9 Jul 2023 08:52:00 +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 4QzLV85Bxqz3K16; Sun, 9 Jul 2023 08:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688892720; 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=LDa5wBAxGPsLwUadns0rQC2pIWt2xdZEJ1Gh4k0zAJ8=; b=F120U3E8MK4WaduhPZIy5QUov2MQuXXgfem84NymX4QwE4WsyZkqsX9VRxaRc756xnPndT 16zaYvHUUeha2jGia0IPJbxBcDBVS4+v5Oq3VU1nQFoaMXQgkUWG81Mm3DE/ziTY6LY5Jz LSJaVX7604NgR2bhop2Y1ormG7EtwinCSfYu8iqcZ4eOJsFaydJkmwpypUbD0w/h52olxK F06gh2+0tgjdlJaAss7rsG2HB2k9Q05tFnESr7VUpkIcbSWHOB0qPVCx0oAlo0/7LoC0M9 gnOs1qv7ROeLn330fItlvhImt1qcbX211I0FgzDjWDPF8kRXanRL7HAHY96uXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688892720; 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=LDa5wBAxGPsLwUadns0rQC2pIWt2xdZEJ1Gh4k0zAJ8=; b=OKREISgaVSynvQiy/zV+cgReRh5alKtpLOCSzFzDC1RayvZErclH5teucBluMDN2wcYkPL q89PtNTlS0FWPutiNBHEqTGH3u4RkjcgmmynWX67nLVKp/8d8HVG2dNJ6GF+qkPYWLIQiO StFDIkOSqIDm2qjkHLsNr9Ppq0aZcdfZS2/3zRP0xTsCfAdneJCEYQdnJpetRb01dnf7ag SAfPtOO9rkilF7iDqZM2MUBHYa98YIUu3SIFZFZn0Fts50b+6e9Lda6Q1XCRpBSvjw4cJP 4cxzeEY0WjNAuOWKBBgbyv5zJYpfHwhdgbegfSbMuRdi6CYd0XakJ+5teR+qaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688892720; a=rsa-sha256; cv=none; b=wdcHsOrm+dMu1e8DXxgvBySGW11jQ/ZNxd/EGw0Xh8WimcbAiYWkwxAnAfeXLF93ycc7ik 6f/tNy5cQn4y9KYshmpJKaSxRQMhXke0NWFX+up3XOO1bJTUxwC0ZzcTYUSJiUGeKmv1ol FHaLQdQL3AWQefJ2lXuqhWafNaxi2Funk7g1a79W/LxEJkv62rSxTqGJ+rGfzHDJSrt0vL oO1Ou5+an5caekGyy2g115gErxYRWdqNd2EQbsyY6chm5BbWvbcF5+nYTY6bOoIM8tR69V zhEfM4hGcqMwjwOthE5FSBMeddinj+LQ1XRKUszX0mXgrMs1B2eK88p0UP308A== 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 4QzLV83qrSzwrt; Sun, 9 Jul 2023 08:52:00 +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 3698q07D079779; Sun, 9 Jul 2023 08:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3698q0r3079778; Sun, 9 Jul 2023 08:52:00 GMT (envelope-from git) Date: Sun, 9 Jul 2023 08:52:00 GMT Message-Id: <202307090852.3698q0r3079778@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 1f7d69835af4 - main - cad/gds3d: Fix build on 14 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f7d69835af4e7549632661924a236ed091c42cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f7d69835af4e7549632661924a236ed091c42cb commit 1f7d69835af4e7549632661924a236ed091c42cb Author: Yuri Victorovich AuthorDate: 2023-07-09 08:51:16 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-09 08:51:57 +0000 cad/gds3d: Fix build on 14 Reported by: fallout --- 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. */