Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 0ad for openSUSE:Factory checked in
at 2024-04-26 23:27:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/0ad (Old)
and /work/SRC/openSUSE:Factory/.0ad.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "0ad"
Fri Apr 26 23:27:14 2024 rev:12 rq:1170217 version:0.0.26
Changes:
--------
--- /work/SRC/openSUSE:Factory/0ad/0ad.changes 2024-03-15 20:31:58.325601837
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new.1880/0ad.changes 2024-04-26
23:27:27.565361480 +0200
@@ -1,0 +2,5 @@
+Thu Apr 25 22:29:04 UTC 2024 - Aaron Puchert <aaronpuch...@alice-dsl.net>
+
+- Add fix-boost-1.85-build.patch to fix build with boost 1.85.
+
+-------------------------------------------------------------------
New:
----
fix-boost-1.85-build.patch
BETA DEBUG BEGIN:
New:
- Add fix-boost-1.85-build.patch to fix build with boost 1.85.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0ad.spec ++++++
--- /var/tmp/diff_new_pack.E1xe8L/_old 2024-04-26 23:27:28.377391163 +0200
+++ /var/tmp/diff_new_pack.E1xe8L/_new 2024-04-26 23:27:28.377391163 +0200
@@ -50,6 +50,8 @@
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
@@ -107,6 +109,9 @@
%patch -P 1 -p1
%patch -P 2 -p1
%endif
+%if %{pkg_vcmp libboost_filesystem-devel >= 1.74}
+%patch -P 6 -p1
+%endif
%build
export CFLAGS="%{optflags}"
++++++ fix-boost-1.85-build.patch ++++++
--- 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()));
}
