diff --git a/.files b/.files index fe36a6c..3e7e4f7 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 08972c5..960dddf 100644 --- a/.rev +++ b/.rev @@ -68,4 +68,13 @@ 1006542 + + 4bb80faca7b343dae51d0afa5cf011de + 0.0.26 + + dimstar_suse + - Add fix-gcc13-build.patch to fix build with GCC 13. + + 1074356 + diff --git a/0ad.changes b/0ad.changes index ce2d46f..e2c6072 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Mar 25 20:11:43 UTC 2023 - Aaron Puchert + +- Add fix-gcc13-build.patch to fix build with GCC 13. + +------------------------------------------------------------------- Mon Sep 26 21:28:24 UTC 2022 - C J - Update to 0.0.26 diff --git a/0ad.spec b/0ad.spec index 3d26256..78b79b2 100644 --- a/0ad.spec +++ b/0ad.spec @@ -1,7 +1,7 @@ # # spec file for package 0ad # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,6 +46,8 @@ Patch1: no-version-check.patch Patch2: PrepareZoneForGC.patch # PATCH-FIX-OPENSUSE -- Skip automatic addition of an RPATH. Patch3: premake-no-automatic-rpath.patch +# PATCH-FIX-UPSTREAM -- Fix build with GCC 13 +Patch4: fix-gcc13-build.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libXcursor-devel @@ -97,6 +99,7 @@ flexible game engine. %setup -q -n %{name}-%{version}-alpha %patch0 -p1 %patch3 -p1 +%patch4 -p1 %if %{with system_mozjs} %patch1 -p1 %patch2 -p1 diff --git a/fix-gcc13-build.patch b/fix-gcc13-build.patch new file mode 100644 index 0000000..84f1a67 --- /dev/null +++ b/fix-gcc13-build.patch @@ -0,0 +1,13 @@ +diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h +index 2fa4780..515ae94 100644 +--- a/source/tools/atlas/GameInterface/Messages.h ++++ b/source/tools/atlas/GameInterface/Messages.h +@@ -212,7 +212,7 @@ QUERY(GetCurrentMapSize, + QUERY(RasterizeMinimap, + , + ((int, dimension)) +- ((std::vector, imageBytes)) ++ ((std::vector, imageBytes)) + ); + + QUERY(GetRMSData,