[packages/widelands] - fix building with gcc8 - rel 2

baggins baggins at pld-linux.org
Sat Apr 6 10:12:08 CEST 2019


commit 854a25643b3b67da6711e988ca89d6836c2876af
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 6 10:11:48 2019 +0200

    - fix building with gcc8
    - rel 2

 gcc8.patch     | 10 ++++++++++
 widelands.spec |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/widelands.spec b/widelands.spec
index 3e577eb..00f1f36 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -7,7 +7,7 @@ Summary:	Game like Settlers II
 Summary(pl.UTF-8):	Remake gry Settlers II
 Name:		widelands
 Version:	0.build%{buildver}
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications/Games
 #Source0Download: https://wl.widelands.org/wiki/Download/#release
@@ -15,6 +15,7 @@ Source0:	http://launchpad.net/widelands/build%{buildver}/build%{buildver}/+downl
 # Source0-md5:	0ef7ccf021b8001056739f755500366d
 Source1:	%{name}.desktop
 Patch0:		%{name}-pld.patch
+Patch1:		gcc8.patch
 URL:		https://wl.widelands.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL2-devel >= 2
@@ -74,6 +75,7 @@ Remake gry Settlers II - pliki danych.
 %prep
 %setup -q -n %{name}-build%{buildver}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/gcc8.patch b/gcc8.patch
new file mode 100644
index 0000000..10c0a40
--- /dev/null
+++ b/gcc8.patch
@@ -0,0 +1,10 @@
+--- widelands-build19-src/CMakeLists.txt~	2019-04-06 09:55:34.000000000 +0200
++++ widelands-build19-src/CMakeLists.txt	2019-04-06 10:02:33.509371888 +0200
+@@ -183,7 +183,6 @@
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
+ 
+ IF (WIN32)
+   add_definitions(-DMINGW_HAS_SECURE_API)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/widelands.git/commitdiff/854a25643b3b67da6711e988ca89d6836c2876af



More information about the pld-cvs-commit mailing list