pool/0ad
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1170217 from games

Browse Source 
- Add fix-boost-1.85-build.patch to fix build with boost 1.85.

OBS-URL: https://build.opensuse.org/request/show/1170217
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/0ad?expand=0&rev=12
This commit is contained in:
Ana Guerrero 2024-04-26 21:27:14 +00:00 committed by Git OBS Bridge
commit 2a4c319f0a
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
0ad.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 25 22:29:04 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Add fix-boost-1.85-build.patch to fix build with boost 1.85.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 8 07:44:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Fri Mar 8 07:44:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

5
0ad.spec
View File

@ -50,6 +50,8 @@ Patch3: premake-no-automatic-rpath.patch
Patch4: fix-gcc13-build.patch Patch4: fix-gcc13-build.patch
# PATCH-FIX-UPSTREAM -- Fix build with fmt 10 # PATCH-FIX-UPSTREAM -- Fix build with fmt 10
Patch5: fix-fmt10-build.patch Patch5: fix-fmt10-build.patch
# PATCH-FIX-UPSTREAM -- Fix build with boost 1.85
Patch6: fix-boost-1.85-build.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libXcursor-devel BuildRequires: libXcursor-devel
@ -107,6 +109,9 @@ flexible game engine.
%patch -P 1 -p1 %patch -P 1 -p1
%patch -P 2 -p1 %patch -P 2 -p1
%endif %endif
%if %{pkg_vcmp libboost_filesystem-devel >= 1.74}
%patch -P 6 -p1
%endif
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"

22
fix-boost-1.85-build.patch Normal file
View File

@ -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()));
}