rpm/0ad
SHA256
1
0
Fork 0
forked from pool/0ad
Code Pull Requests Activity

Accepting request 1131230 from games

Browse Source 
- Add fix-fmt10-build.patch to fix build with libfmt 10.

OBS-URL: https://build.opensuse.org/request/show/1131230
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/0ad?expand=0&rev=10
This commit is contained in:
Ana Guerrero 2023-12-06 22:48:28 +00:00 committed by Git OBS Bridge
commit df01994d70
3 changed files with 56 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 @@
-------------------------------------------------------------------
Tue Dec 5 22:44:36 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Add fix-fmt10-build.patch to fix build with libfmt 10.
-------------------------------------------------------------------
Sat Mar 25 20:11:43 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>

3
0ad.spec
View File

@ -48,6 +48,8 @@ Patch2: PrepareZoneForGC.patch
Patch3: premake-no-automatic-rpath.patch
# PATCH-FIX-UPSTREAM -- Fix build with GCC 13
Patch4: fix-gcc13-build.patch
# PATCH-FIX-UPSTREAM -- Fix build with fmt 10
Patch5: fix-fmt10-build.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libXcursor-devel
@ -100,6 +102,7 @@ flexible game engine.
%patch0 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%if %{with system_mozjs}
%patch1 -p1
%patch2 -p1

48
fix-fmt10-build.patch Normal file
View File

@ -0,0 +1,48 @@
From 839edc3ae61cd313d37a14a9a24e2ef1bd4e5808 Mon Sep 17 00:00:00 2001
From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
Date: Wed, 31 May 2023 12:03:04 +0000
Subject: [PATCH] Fix the removal of implicit conversions in libfmt 10 by using
explicit casts. Patch by: @phosit Accepted by: @vladislavbelov Comments by:
@sera
Differential Revision: https://code.wildfiregames.com/D4998
git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27657 3db68df2-c116-0410-a063-a993310a9797
---
source/network/NetMessage.cpp | 5 +++--
source/simulation2/serialization/BinarySerializer.cpp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
index 61126d8e1b0..9515d939ded 100644
--- a/source/network/NetMessage.cpp
+++ b/source/network/NetMessage.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2023 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -216,7 +216,8 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
break;
default:
- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received",
+ static_cast<int>(header.GetType()));
break;
}
diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
index c24b84bb2c1..4a6b57d7a99 100644
--- a/source/simulation2/serialization/BinarySerializer.cpp
+++ b/source/simulation2/serialization/BinarySerializer.cpp
@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
case js::Scalar::Uint8Clamped:
return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
default:
- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
throw PSERROR_Serialize_InvalidScriptValue();
}
}