From nobody Wed Dec 18 20:51:32 2024 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 4YD5Sh3rxtz5gv2h; Wed, 18 Dec 2024 20:51:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YD5Sh2rqdz53PX; Wed, 18 Dec 2024 20:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734555092; 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=wyv4G8X76gJ4DX+q8ZcN9b0/4DMP1CKwG8mIbJ7y8Mk=; b=Vb1Omjx3GZQFawN/rnafig1ciiXDnlLvuRvUYHWXm+M8BlgBVg+0LO9X7KV+OAryu6GViV Zg7c6t5npV8Ik9kegDPDoxhg87lDNYZnawJPEE4YkMmLB0fFu2SZJTqnmz/QS9W/pRrUtz NESpZ/JIOW07aoQk0FIl98haK6I+GlJ0yjrp73GWGXjGIjPalvowJf0lmLfw1BOLw7uQ+e vi9PIBCI9vY5GXUZxZKAmBm5H+OZQBWPMRqMSM/eTGJCNm9jXGnL7qWx0M/vW1uIfJCEaR CQIOoQA9fim6HIgimb+mRQvCIY71tzVVZqQVu8mrYw/4+u9Pll0yCmeRSdQh0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734555092; 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=wyv4G8X76gJ4DX+q8ZcN9b0/4DMP1CKwG8mIbJ7y8Mk=; b=uRw1crnVmNDQnAwMJZOPV6Yz7OTeEvdk07J5BJNtfuvUB2hhdvmG+1xW+k/tYEKd6K/KO5 Nesj2JqMK/l4tEHWayHqthbLRA39GhSUqMxZC8uc9E7HDeA1fxMaClII2t+Hsf+FejdpmL 2TXCymn+P12yDrqpO0XrnEvsh2Kyx6w0yuZGXyr4v6is5H24DbgOckk2e3ZRFzNmvcfpvm N7v4kt2eSDjRC7xSqbalyyWn3YzNIj5nHOmwPu37qCR97hXSWiFWtSvOEYnuKxn3K+tHAD kYYJhqFOTNESA52NBMVWPDKK5PdbdFcomlvXFb2oMIeAxi35Tp0A5DgqRKtqfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734555092; a=rsa-sha256; cv=none; b=PABsfdL54MFkmAp+RQKmz/ZP0ecs/QW0iFT/4UN3PdpnTNWdmHkNoaOZde3e8isJ63HP4j 0RKebFcEk6Wp6LpTEPBLzePEpYjZbg56IcSB2ikR+U9Eo02Q5J6nQRqBOe1de1EK6GO3yd hRXGuxZc45NG3IOY1MolcJ3FTfvTPXQLHKHxn5QL4lk5WG0nSHuOPZBfpK1DEYd8cREg4V ZDS8R15JXGwv5p4OlhEkhzGNqchQ/5qH9Qn6mp4E5e+xOXmhUcsgXDXBLHrwyvfWfpxWTt S5SYsCKv/dt/990Um4r3CDDFJmqmSohmDpx3g/uVY7u/cmSOnV2w1TPlOdd2Rw== 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 4YD5Sh2S9SzNbV; Wed, 18 Dec 2024 20:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BIKpWx3014061; Wed, 18 Dec 2024 20:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BIKpW8X014058; Wed, 18 Dec 2024 20:51:32 GMT (envelope-from git) Date: Wed, 18 Dec 2024 20:51:32 GMT Message-Id: <202412182051.4BIKpW8X014058@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: 23306f7a0a73 - main - games/xye: Fix build 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 23306f7a0a7359e340e232cf3f839d690f32e158 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=23306f7a0a7359e340e232cf3f839d690f32e158 commit 23306f7a0a7359e340e232cf3f839d690f32e158 Author: Yuri Victorovich AuthorDate: 2024-12-18 20:51:00 +0000 Commit: Yuri Victorovich CommitDate: 2024-12-18 20:51:00 +0000 games/xye: Fix build Reported by: fallout --- games/xye/files/patch-src_xye__script.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/games/xye/files/patch-src_xye__script.cpp b/games/xye/files/patch-src_xye__script.cpp new file mode 100644 index 000000000000..b95da5057445 --- /dev/null +++ b/games/xye/files/patch-src_xye__script.cpp @@ -0,0 +1,16 @@ +- fix compilation: +- error: reference to 'lock' is ambiguous +- note: candidate found by name lookup is 'lock' +- note: candidate found by name lookup is 'std::lock' + +--- src/xye_script.cpp.orig 2012-09-15 20:21:06 UTC ++++ src/xye_script.cpp +@@ -859,7 +859,7 @@ void Load_Lock(TiXmlElement* el) + el->QueryIntAttribute("x",&LastX); + el->QueryIntAttribute("y",&LastY); + blockcolor c=GetElementBlockColor(el); +- lock* bc=new lock(game::SquareN(LastX,LastY),c); ++ ::lock* bc=new ::lock(game::SquareN(LastX,LastY),c); + } + + /* Load Key*/