summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2017-09-07 17:51:24 +0200
committerSven Eden <sven.eden@gmx.de>2017-09-07 17:51:24 +0200
commitce66c99accf3dbb57685c53dea433ffaaa08d5e7 (patch)
treea31dc2a2a2ae94cb475e648ed221bb30a22c2039
parentsys-auth/elogind: Fix elogind.conf for v235+ (diff)
downloadseden-ce66c99accf3dbb57685c53dea433ffaaa08d5e7.tar.gz
seden-ce66c99accf3dbb57685c53dea433ffaaa08d5e7.tar.bz2
seden-ce66c99accf3dbb57685c53dea433ffaaa08d5e7.zip
games-strategy/widelands-0.19-r2: Added a small patch for gcc-7.2 compatibility
-rw-r--r--games-strategy/widelands/files/widelands-0.19-fix_maybe_uninitialized.patch21
-rw-r--r--games-strategy/widelands/widelands-0.19-r2.ebuild (renamed from games-strategy/widelands/widelands-0.19-r1.ebuild)4
2 files changed, 25 insertions, 0 deletions
diff --git a/games-strategy/widelands/files/widelands-0.19-fix_maybe_uninitialized.patch b/games-strategy/widelands/files/widelands-0.19-fix_maybe_uninitialized.patch
new file mode 100644
index 0000000..8080b94
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.19-fix_maybe_uninitialized.patch
@@ -0,0 +1,21 @@
+--- a/src/network/netclient.cc 2017-09-07 17:03:04.532134374 +0200
++++ b/src/network/netclient.cc 2017-09-07 17:10:54.603125955 +0200
+@@ -477,6 +477,8 @@
+ // This might happen, if a users connects after the game starts.
+ if (number == d->settings.users.size()) {
+ UserSettings newuser;
++ newuser.position = number;
++ newuser.ready = false;
+ d->settings.users.push_back(newuser);
+ }
+
+--- a/src/network/nethost.cc 2017-09-07 17:11:58.924124804 +0200
++++ b/src/network/nethost.cc 2017-09-07 17:13:37.339123041 +0200
+@@ -1612,6 +1612,7 @@
+ if (client.usernum == -1) {
+ client.usernum = d->settings.users.size();
+ UserSettings newuser;
++ newuser.position = client.usernum;
+ newuser.result = Widelands::PlayerEndResult::UNDEFINED;
+ newuser.ready = true;
+ d->settings.users.push_back(newuser);
diff --git a/games-strategy/widelands/widelands-0.19-r1.ebuild b/games-strategy/widelands/widelands-0.19-r2.ebuild
index fb49807..097b3d6 100644
--- a/games-strategy/widelands/widelands-0.19-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.19-r2.ebuild
@@ -36,6 +36,10 @@ CMAKE_BUILD_TYPE=Release
# Game is NOT happy being moved from /usr/share/games
PREFIX="/usr/share/games/${PN}"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix_maybe_uninitialized.patch
+)
+
src_prepare() {
default