From nobody Sun Oct 06 08:42:06 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 4XLwkk48q9z5YVjG; Sun, 06 Oct 2024 08:42:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XLwkk3XPWz4bmm; Sun, 6 Oct 2024 08:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728204126; 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=UGME+t70W99fc0OhF0ivJ9+AYu1Mv4QR/HuN/NWAmIM=; b=R3IFJDKf1ieA0lw4mymJ66Zs4kn64L3Xa7wse0Hivj/1zqOlnE3kQTegyqFf4QMIKXkqbw i2i+N/OnSaPNDnVC5g23PzzjXqNXCquTSGOzWaVhp8pNrvFF9gLGutf5gJX0ZIgtrZ35wM F9GuFwr0sfnFV8+g7iuUtNXDxaEVWYmaq+vZflF7uVvVlMrR7rKIY6N7ivJ3LD5I9ukvIi kgQxIUBQEiEh7N0lGQWu5tw3gupFDNjcwHhYaX/vNyJH6OcYAyZjidgMZx5PSWg3quwbgM a7lWTxriWpJrDGcfS68RwSrmv6g+Q4R4H6bUO8s9KOmCnaf9A2Y264W3j+jQVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728204126; 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=UGME+t70W99fc0OhF0ivJ9+AYu1Mv4QR/HuN/NWAmIM=; b=R/LRbNsX2qatxft3qcZFwyh7UQ51XDlySO8qv/RM1Kn5Li2csD/aQIr23JQnoHIa9UKVXK d4Xc6n7Ap4/qmoAe/gJMpWZ7LpLkPEpuYswdOmwhHV0XDRrcIwYHVnFW/SbNSf0U68brkl 7pc/acJ3IC2A8P4RwuCn1bY0JRSG1q/sWJAtk9EcZzou+aFY++z32/oVD3e1n/qpy+gpp2 22tXHuBSHxb+yKw9pxQW2Tsj4JEUw/V0tbQsEgzcvi8S5c0FwhuZ5m75vt50uIusWD6V0K R85uWXUS1t2NCK4FxU2x8Nquqt87ItRfecQIGXLvMyzbWBRyesQ+QXhAsnU7cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728204126; a=rsa-sha256; cv=none; b=LUvLUFiw2AURsXqJYrlST5LSDU3tM2yT57k0JfTkphmeW88iLFrx4LOrmkA8Zqqa+e1I/I 2zC6RTlvAcEfjaG6OVRnGtMaafiITvhuPsG56rbyBF1uSef7qzJ/pCQWFZeWdTReRwm8P3 e910WGeKzQ2S0DOBLJ+Kj/JZ6Yg9IVKpcusX7HNedj7lvgnwsvxnPRDC2c37k3iOm4+fqC sjtL30CoSwoPFvGQViwNBn9dMIOHxjRLAEdH1GXiRPdCtJWCrQMAqEzwI4CAuFkPvd3pIE hhmZuRnmBFOrq4lqrLR9kpNI+6kjO6VTl1YllQ5fwmKTcMPabe4imy1Q6VNXbA== 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 4XLwkk37h1zvnS; Sun, 6 Oct 2024 08:42:06 +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 4968g6WG000500; Sun, 6 Oct 2024 08:42:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4968g61u000497; Sun, 6 Oct 2024 08:42:06 GMT (envelope-from git) Date: Sun, 6 Oct 2024 08:42:06 GMT Message-Id: <202410060842.4968g61u000497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 8cdf9918b1af - main - games/0ad: Fix buyild with new boost 1.85 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cdf9918b1af79f3a1bfc510eb457bc3947ce206 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cdf9918b1af79f3a1bfc510eb457bc3947ce206 commit 8cdf9918b1af79f3a1bfc510eb457bc3947ce206 Author: Guido Falsi AuthorDate: 2024-10-06 08:40:42 +0000 Commit: Guido Falsi CommitDate: 2024-10-06 08:40:42 +0000 games/0ad: Fix buyild with new boost 1.85 PR: 281852 Obtained from: https://gitea.wildfiregames.com/0ad/0ad/commit/0831f5d3ce214970fed1b3a55817e7246acd58db --- games/0ad/files/patch-boost-1.85 | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/games/0ad/files/patch-boost-1.85 b/games/0ad/files/patch-boost-1.85 new file mode 100644 index 000000000000..810873db2c50 --- /dev/null +++ b/games/0ad/files/patch-boost-1.85 @@ -0,0 +1,49 @@ +diff --git a/source/graphics/TextureManager.cpp b/source/graphics/TextureManager.cpp +index ec68b15989..9cfa615997 100644 +--- source/graphics/TextureManager.cpp ++++ source/graphics/TextureManager.cpp +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2023 Wildfire Games. ++/* Copyright (C) 2024 Wildfire Games. + * This file is part of 0 A.D. + * + * 0 A.D. is free software: you can redistribute it and/or modify +@@ -806,7 +806,7 @@ public: + files.push_back(f); + p = p / GetWstringFromWpath(*it); + } +- return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files); ++ return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files); + } + + /** +diff --git a/source/lib/file/file_system.cpp b/source/lib/file/file_system.cpp +index 1db6dc65d3..2b1fdba056 100644 +--- source/lib/file/file_system.cpp ++++ source/lib/file/file_system.cpp +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2023 Wildfire Games. ++/* Copyright (C) 2024 Wildfire Games. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the +@@ -32,6 +32,7 @@ + #include "lib/sysdep/filesystem.h" + + #include ++#include + #include + + bool DirectoryExists(const OsPath& path) +@@ -229,7 +230,11 @@ Status CopyFile(const OsPath& path, const OsPath& newPath, bool override_if_exis + try + { + if(override_if_exists) ++#if BOOST_VERSION >=107400 ++ fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_options::overwrite_existing); ++#else + fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists); ++#endif + else + fs::copy_file(fs::path(path.string()), fs::path(newPath.string())); + }