From nobody Thu Jul 20 18:05:03 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 4R6LFD1lk3z4nfrd; Thu, 20 Jul 2023 18:05:04 +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 4R6LFD1GBrz3lTG; Thu, 20 Jul 2023 18:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689876304; 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=2kcWIPQgDzc06BgHoVYS5pth15ksvw2q8XzGv9I/61g=; b=HBL47IURCSz22ZVgDREDNCX5lEw11cS06Occd5mukXlgj8B1ke0aaP7h2EOMATa6vbeN8B AX0xhFQFW09jzLhKMj8FvB0DU/RYF0Gmk8SnJ31/QL8GDwpVNPa2/q4MrupVROp8nyuape W/jjN98bIyFboK75enPjv6Nhh1+TyPFUoXZBVDzQ6cqq8dJomyew6NtR/01wN9c0ednmOx zdZeKdZEC5tc/+apTDEK8pSCK8JwSaZJg4xmMTYi23Z2xZzO97lcQgobrEK7rpJUKMQill TSXrBgLcquqfljT5vn9qrOMCmdTs5BtjPtty19C2NziT0NVVMe6E4/SNHsD7xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689876304; 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=2kcWIPQgDzc06BgHoVYS5pth15ksvw2q8XzGv9I/61g=; b=VWnITVFxnTpIaGM6MNxaf8D1pFuaT2ZN4+Glo5B+xnm7rpFjpnmxrUIbwBHqmyF2OuyUf5 QLHBMdT7xkDS1VRW7f/0vJhd3YJ0pjRe6S0SM4b/DIC5JrhXoBkRHrq0Zk6wqZHKOfj202 ilKKYg9KZSSrXchxUFLotod+Hog21rEx8PkL4WHoKJ2wbwf3rkqbqOGIY/iWCr3ukQz61U TexNyjpipTtjORcyWqgoK4vF3kyVi7/saP2hLjVq9H0KCB2IGTvgQfTzATWlfK2ROR4D5+ Mir2btCDJrCo1KsBtctcJ+hjm6PybcR1y/owAF98PIy7JG1P6vaeci5KWZUGRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689876304; a=rsa-sha256; cv=none; b=Temuy5BM/QXgm2Azk/oTNmkEFDXKaflK5ggqduxUsOZrNtUZ/+lpUI8/40Y5I/pUPVDFLr Ue8QTO9fW6+9iF9g+Efqy3a+AacYp25JmJPyR2UMYJCXBJm+5h2j3lpNSRLrWqgFdgI+Qd m/SNfbi4kBH2sXF0XYD3r+ispYB2PGcOETpYO/LGl4fvZux8u8DBgLUMz37tIbEBnTVFgw smbWd638cKvMjgb4REYdC+XaT8+GvAurCWyDyEikUfGhLDs6eclMybIxdrhl1ROfbfded5 ilv6xqWwOvOpIILRGqAEBcpTM8/fWhiFWjLARWmsj6FFJEOCM3U9MFnyFymgGg== 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 4R6LFD0KRkzh1D; Thu, 20 Jul 2023 18:05:04 +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 36KI53Cs071793; Thu, 20 Jul 2023 18:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KI53Tm071792; Thu, 20 Jul 2023 18:05:03 GMT (envelope-from git) Date: Thu, 20 Jul 2023 18:05:03 GMT Message-Id: <202307201805.36KI53Tm071792@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: 48eaab4ce10e - main - cad/gds3d: Fix build breakaga on 14 due to the 'byte' symbol collision 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/main X-Git-Reftype: branch X-Git-Commit: 48eaab4ce10eeea0a409118ad2c340dbc6a2c1f8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=48eaab4ce10eeea0a409118ad2c340dbc6a2c1f8 commit 48eaab4ce10eeea0a409118ad2c340dbc6a2c1f8 Author: Yuri Victorovich AuthorDate: 2023-07-18 14:21:39 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-18 14:21:39 +0000 cad/gds3d: Fix build breakaga on 14 due to the 'byte' symbol collision The previous fix didn't include one more location. --- cad/gds3d/files/patch-manual-gdsparse.cpp | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/cad/gds3d/files/patch-manual-gdsparse.cpp b/cad/gds3d/files/patch-manual-gdsparse.cpp new file mode 100644 index 000000000000..5042567f1bf9 --- /dev/null +++ b/cad/gds3d/files/patch-manual-gdsparse.cpp @@ -0,0 +1,33 @@ +- workaround for error: reference to 'byte' is ambiguous, see https://github.com/trilomix/GDS3D/issues/23 + +--- ../libgdsto3d/gdsparse.cpp.orig 2023-07-20 10:59:11.684448000 -0700 ++++ ../libgdsto3d/gdsparse.cpp 2023-07-20 10:59:35.325794000 -0700 +@@ -127,7 +127,7 @@ + + bool GDSParse::ParseFile(char *topcell) + { +- byte recordtype, datatype; ++ ::byte recordtype, datatype; + char *tempstr; + //struct ProcessLayer *layer = NULL; + +@@ -1086,7 +1086,7 @@ + + short GDSParse::GetBitArray() + { +- byte byte1; ++ ::byte byte1; + + fread(&byte1, 1, 1, _iptr); + fread(&byte1, 1, 1, _iptr); +@@ -1097,8 +1097,8 @@ + + double GDSParse::GetEightByteReal() + { +- byte value; +- byte b8, b2, b3, b4, b5, b6, b7; ++ ::byte value; ++ ::byte b8, b2, b3, b4, b5, b6, b7; + double sign=1.0; + double exponent; + double mant;