commit aa9767264d536bce12b3544b43b5338442cd7190
Author: Jan Rękorajski <[email protected]>
Date: Sat Apr 6 10:21:08 2019 +0200
- fix building with gcc 8
- rel 4
gcc8.patch | 11 +++++++++++
warzone2100.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/warzone2100.spec b/warzone2100.spec
index abf00f7..c1689a6 100644
--- a/warzone2100.spec
+++ b/warzone2100.spec
@@ -2,12 +2,13 @@ Summary: 3D realtime strategy on a future Earth
Summary(pl.UTF-8): Gra RTS, której akcja toczy się w przyszłości
Name: warzone2100
Version: 3.1.2
-Release: 3
+Release: 4
License: GPL v2+
Group: X11/Applications/Games/Strategy
Source0:
http://downloads.sourceforge.net/warzone2100/%{name}-%{version}.tar.xz
# Source0-md5: 4e947125e9604821164f1ad9d1922447
Patch0: glew-1.12.patch
+Patch1: gcc8.patch
URL: http://www.wz2100.net/
BuildRequires: OpenAL-devel >= 0.0.8-4
BuildRequires: OpenGL-GLU-devel
@@ -65,6 +66,7 @@ Warzone 2100 data files
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# et_EE -> et
%{__sed} -e 's/et_EE/et/g' -i po/LINGUAS
diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644
index 0000000..edb786d
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,11 @@
+--- warzone2100-3.1.2/src/challenge.cpp~ 2013-11-24 02:25:10.000000000
+0100
++++ warzone2100-3.1.2/src/challenge.cpp 2019-04-06 10:18:01.394811430
+0200
+@@ -100,7 +100,7 @@
+
+ fStr = strrchr(sRequestResult, '/');
+ fStr++; // skip slash
+- if (fStr == '\0')
++ if (*fStr == '\0')
+ {
+ debug(LOG_ERROR, "Bad path to challenge file (%s)",
sRequestResult);
+ return;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/warzone2100.git/commitdiff/aa9767264d536bce12b3544b43b5338442cd7190
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
