Accepting request 1006266 from home:CJ:branches:games

- Update to 0.0.26
- Remove obsolete glibc-2.35.patch.

OBS-URL: https://build.opensuse.org/request/show/1006266
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=126
This commit is contained in:
Aaron Puchert 2022-09-26 23:26:52 +00:00 committed by Git OBS Bridge
parent 31d652a33a
commit 75c3b16ad3
5 changed files with 11 additions and 21 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d70dcd75f473a7d5c81432c3d9260926bf8d9dff5cd541796169497d1c522edd
size 75579956

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
size 75599800

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 26 21:28:24 UTC 2022 - C J <c.j@tuta.io>
- Update to 0.0.26
- Remove obsolete glibc-2.35.patch.
-------------------------------------------------------------------
Wed Aug 10 21:06:44 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>

View File

@ -31,7 +31,7 @@
# Use provided library
%bcond_without system_nvtt
Name: 0ad
Version: 0.0.25b
Version: 0.0.26
Release: 0
Summary: A real-time strategy game of ancient warfare
License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0-or-later AND LGPL-3.0-or-later AND MIT AND ISC AND MPL-2.0
@ -44,10 +44,8 @@ Patch0: avoid_duplicate_global_symbol_from_asm.patch
Patch1: no-version-check.patch
# PATCH-FIX-OPENSUSE -- Use the newer variant of this function (related to mozjs78 upgrade)
Patch2: PrepareZoneForGC.patch
# PATCH-FIX-UPSTREAM -- Don't define M_PIf if glibc already provides it
Patch3: glibc-2.35.patch
# PATCH-FIX-OPENSUSE -- Skip automatic addition of an RPATH.
Patch4: premake-no-automatic-rpath.patch
Patch3: premake-no-automatic-rpath.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libXcursor-devel
@ -99,7 +97,6 @@ flexible game engine.
%setup -q -n %{name}-%{version}-alpha
%patch0 -p1
%patch3 -p1
%patch4 -p1
%if %{with system_mozjs}
%patch1 -p1
%patch2 -p1

View File

@ -1,13 +0,0 @@
diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
index d4796ec..d0e8c9a 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
@@ -29,7 +29,9 @@ using AtlasMessage::Shareable;
static Observable<AtlasMessage::sEnvironmentSettings> g_EnvironmentSettings;
+#ifndef M_PIf
const float M_PIf = 3.14159265f;
+#endif
//////////////////////////////////////////////////////////////////////////