pool/0ad
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 956155 from home:aaronpuchert:branches:games

Browse Source 
- Add glibc-2.35.patch: Fix build with glibc 2.35.
- Use system mozjs on Leap 15.4 as well.

OBS-URL: https://build.opensuse.org/request/show/956155
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=115
This commit is contained in:
Dirk Stoecker 2022-02-24 14:48:49 +00:00 committed by Git OBS Bridge
parent 3f1afb3225
commit 1063b0d2a6
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0ad.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 20 14:52:56 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Add glibc-2.35.patch: Fix build with glibc 2.35.
- Use system mozjs on Leap 15.4 as well.
-------------------------------------------------------------------
Tue Jan 11 19:34:38 UTC 2022 - Simon Puchert <simonpuchert@alice.de>

7
0ad.spec
View File

@ -22,8 +22,8 @@
%else
%bcond_with nvtt
%endif
#
%if 0%{?suse_version} >= 1550
# We can use the system mozjs on Tumbleweed and Leap 15.4.
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
%bcond_without system_mozjs
%else
%bcond_with system_mozjs
@ -44,6 +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
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libXcursor-devel
@ -93,6 +95,7 @@ flexible game engine.
%prep
%setup -q -n %{name}-%{version}-alpha
%patch0 -p1
%patch3 -p1
%if %{with system_mozjs}
%patch1 -p1
%patch2 -p1

13
glibc-2.35.patch Normal file
View File

@ -0,0 +1,13 @@
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
//////////////////////////////////////////////////////////////////////////