From 73223a258f5bf9814fc7a2c2c7cdaa2034e6778da131211e911a9f716a4ca41e Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Fri, 26 Apr 2024 01:30:48 +0000 Subject: [PATCH] - Add fix-boost-1.85-build.patch to fix build with boost 1.85. OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=134 --- 0ad.changes | 5 +++++ 0ad.spec | 3 +++ fix-boost-1.85-build.patch | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 fix-boost-1.85-build.patch diff --git a/0ad.changes b/0ad.changes index 49572f1..cbec427 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 25 22:29:04 UTC 2024 - Aaron Puchert + +- Add fix-boost-1.85-build.patch to fix build with boost 1.85. + ------------------------------------------------------------------- Fri Mar 8 07:44:09 UTC 2024 - Dominique Leuenberger diff --git a/0ad.spec b/0ad.spec index 76d6046..c99749c 100644 --- a/0ad.spec +++ b/0ad.spec @@ -50,6 +50,8 @@ Patch3: premake-no-automatic-rpath.patch Patch4: fix-gcc13-build.patch # PATCH-FIX-UPSTREAM -- Fix build with fmt 10 Patch5: fix-fmt10-build.patch +# PATCH-FIX-UPSTREAM -- Fix build with boost 1.85 +Patch6: fix-boost-1.85-build.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libXcursor-devel @@ -103,6 +105,7 @@ flexible game engine. %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 %if %{with system_mozjs} %patch -P 1 -p1 %patch -P 2 -p1 diff --git a/fix-boost-1.85-build.patch b/fix-boost-1.85-build.patch new file mode 100644 index 0000000..8119d17 --- /dev/null +++ b/fix-boost-1.85-build.patch @@ -0,0 +1,22 @@ +--- 0ad-0.0.26-alpha/source/graphics/TextureManager.cpp ++++ 0ad-0.0.26-alpha/source/graphics/TextureManager.cpp +@@ -785,7 +785,7 @@ + files.push_back(f); + p = p / GetWstringFromWpath(*it); + } +- return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files); ++ return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files); + } + + /** +--- 0ad-0.0.26-alpha/source/lib/file/file_system.cpp ++++ 0ad-0.0.26-alpha/source/lib/file/file_system.cpp +@@ -218,7 +218,7 @@ + try + { + if(override_if_exists) +- fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists); ++ 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())); + }