- Add fix-gcc13-build.patch to fix build with GCC 13.

OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=128
This commit is contained in:
Aaron Puchert 2023-03-25 20:48:17 +00:00 committed by Git OBS Bridge
parent 75c3b16ad3
commit a384703c57
3 changed files with 22 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 25 20:11:43 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Add fix-gcc13-build.patch to fix build with GCC 13.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 21:28:24 UTC 2022 - C J <c.j@tuta.io> Mon Sep 26 21:28:24 UTC 2022 - C J <c.j@tuta.io>

View File

@ -1,7 +1,7 @@
# #
# spec file for package 0ad # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -46,6 +46,8 @@ Patch1: no-version-check.patch
Patch2: PrepareZoneForGC.patch Patch2: PrepareZoneForGC.patch
# PATCH-FIX-OPENSUSE -- Skip automatic addition of an RPATH. # PATCH-FIX-OPENSUSE -- Skip automatic addition of an RPATH.
Patch3: premake-no-automatic-rpath.patch Patch3: premake-no-automatic-rpath.patch
# PATCH-FIX-UPSTREAM -- Fix build with GCC 13
Patch4: fix-gcc13-build.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libXcursor-devel BuildRequires: libXcursor-devel
@ -97,6 +99,7 @@ flexible game engine.
%setup -q -n %{name}-%{version}-alpha %setup -q -n %{name}-%{version}-alpha
%patch0 -p1 %patch0 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%if %{with system_mozjs} %if %{with system_mozjs}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1

13
fix-gcc13-build.patch Normal file
View File

@ -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<uint8_t>, imageBytes))
+ ((std::vector<unsigned char>, imageBytes))
);
QUERY(GetRMSData,