Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package 0ad for openSUSE:Factory checked in
at 2022-02-24 18:21:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/0ad (Old)
and /work/SRC/openSUSE:Factory/.0ad.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "0ad"
Thu Feb 24 18:21:19 2022 rev:2 rq:957395 version:0.0.25b
Changes:
--------
--- /work/SRC/openSUSE:Factory/0ad/0ad.changes 2022-01-14 23:14:26.302678118
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new.1958/0ad.changes 2022-02-24
18:24:47.778637498 +0100
@@ -1,0 +2,6 @@
+Sun Feb 20 14:52:56 UTC 2022 - Aaron Puchert <aaronpuch...@alice-dsl.net>
+
+- Add glibc-2.35.patch: Fix build with glibc 2.35.
+- Use system mozjs on Leap 15.4 as well.
+
+-------------------------------------------------------------------
New:
----
glibc-2.35.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0ad.spec ++++++
--- /var/tmp/diff_new_pack.N8v00q/_old 2022-02-24 18:24:48.630637276 +0100
+++ /var/tmp/diff_new_pack.N8v00q/_new 2022-02-24 18:24:48.634637274 +0100
@@ -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 @@
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 @@
%prep
%setup -q -n %{name}-%{version}-alpha
%patch0 -p1
+%patch3 -p1
%if %{with system_mozjs}
%patch1 -p1
%patch2 -p1
++++++ glibc-2.35.patch ++++++
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
//////////////////////////////////////////////////////////////////////////
