diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-19 23:10:28 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 20:12:39 +0100 |
| commit | bc08b942e91aa8e4f1a65d68753c928cce84e1e0 (patch) | |
| tree | dc985c743324330381c504357cefef6944809a32 /pkgs/games | |
| parent | 41cb4593b437f2ef1caad989a0f8f6f62ac5e62f (diff) | |
| download | nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.tar nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.tar.gz nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.tar.bz2 nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.tar.lz nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.tar.xz nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.tar.zst nixpkgs-bc08b942e91aa8e4f1a65d68753c928cce84e1e0.zip | |
warmux: add patch to fix build with gcc6
Diffstat (limited to 'pkgs/games')
| -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 1ac476b92a3..913b912af7d 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); |