summary refs log tree commit diff
path: root/pkgs/games/warmux/gcc-fix.patch
blob: 913b912af7d48a43d649f9e99319b06b6febbd59 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
## i-love-you-lordheavy.patch [diff]
diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
--- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
+++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
@@ -81,7 +81,7 @@
 }
 
 // Build an action from a network packet
-Action::Action(const char *buffer, DistantComputer* _creator)
+Action::Action(char *buffer, DistantComputer* _creator)
 {
   m_creator = _creator;
 
diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
--- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
@@ -168,7 +168,7 @@
   Action(Action_t type, Double value1, Double value2);
 
   // Build an action from a network packet
-  Action(const char* buffer, DistantComputer* _creator);
+  Action(char* buffer, DistantComputer* _creator);
 
   ~Action();
 
Description: Fix FTBFS with gcc 4.7.
Author: Felix Geyer <debfx-pkg@fobos.de>

--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
+++ warmux-11.04.1+repack/tools/list_games/main.cpp
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <unistd.h>
 #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);