JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warmux: add patch to fix build with gcc6

Browse Source
This commit is contained in:
Robin Gloster 2017-01-19 23:10:28 +01:00
parent b705cd4da7
commit 1ce3d0b97e
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/games/warmux/gcc-fix.patch
View File

@ -34,3 +34,18 @@ Author: Felix Geyer <debfx-pkg@fobos.de>
#include <WARMUX_types.h> #include <WARMUX_types.h>
#include <WARMUX_network.h> #include <WARMUX_network.h>
#include <WARMUX_index_server.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);