diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-19 23:10:28 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-20 16:39:30 +0100 |
| commit | 1ce3d0b97e23e024e82ffbc64f3e0042f94496dc (patch) | |
| tree | b101613891d48c480b8bfd9916092945e13d1949 /pkgs/games/warmux | |
| parent | b705cd4da7a7c12aef5b199a40ba729d773d0d3c (diff) | |
warmux: add patch to fix build with gcc6
Diffstat (limited to 'pkgs/games/warmux')
| -rw-r--r-- | pkgs/games/warmux/gcc-fix.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch index 1ac476b92a32e..913b912af7d48 100644 --- a/pkgs/games/warmux/gcc-fix.patch +++ b/pkgs/games/warmux/gcc-fix.patch @@ -34,3 +34,18 @@ Author: Felix Geyer <debfx-pkg@fobos.de> #include <WARMUX_types.h> #include <WARMUX_network.h> #include <WARMUX_index_server.h> + +Description: Fix conversion error in gcc 6. +Author: Robin Gloster <mail@glob.in> + +--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp 2017-01-19 23:06:32.401035923 +0100 ++++ warmux-11.04.1/src/interface/weapon_menu.cpp 2017-01-19 23:07:14.245866593 +0100 +@@ -391,7 +391,7 @@ + Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) + { + if (!show) +- return false; ++ return nullptr; + const std::vector<PolygonItem *>& items = poly->GetItem(); + WeaponMenuItem * tmp; + Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); |