haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix x86_64 for TimeTracker, Toner, WakeUp and BeBattle (#2019)

Browse Source 
* haiku-apps/genesis_commander: mark as tested.
* haiku-apps/timetracker: add patch for gcc5 builds only.
* haiku-apps/toner: add patch, bump revision.
* haiku-apps/wakeup: add patch, bump revision.
* haiku-games/bebattle: add patch, bump revision.
This commit is contained in:
nys
2018-01-02 16:33:57 +08:00
committed by fbrosson
parent d2af306cf8
commit fbc7bedf63
9 changed files with 179 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
haiku-games/bebattle/bebattle-1.0.0.recipe
View File

@@ -4,13 +4,14 @@ attempt to completely destroy your opponent's units."
HOMEPAGE="https://github.com/HaikuArchives/BeBattle/"
COPYRIGHT="1999-2000 Jonathan Villemure"
LICENSE="MIT"
REVISION="1"
REVISION="2"
COMMIT="e44b8fd01f895e1ef068ab330abd3e492d95d369"
SOURCE_URI="https://github.com/HaikuArchives/BeBattle/archive/$COMMIT.tar.gz"
CHECKSUM_SHA256="30be929f3fb9725fc8ca6f817fb75abd45c526436154d5dc397f39940b48f583"
SOURCE_DIR="BeBattle-$COMMIT"
PATCHES="bebattle-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 !x86 !x86_64"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
PROVIDES="
bebattle = $portVersion

73
haiku-games/bebattle/patches/bebattle-1.0.0.patchset Normal file
View File

@@ -0,0 +1,73 @@
From 5dd75922da05e89311adf480d94e39a6e0b285f2 Mon Sep 17 00:00:00 2001
From: nys <33534144+nysnatuss@users.noreply.github.com>
Date: Sun, 31 Dec 2017 22:52:34 +0000
Subject: patch for x86_64
diff --git a/src/Makefile b/src/Makefile
index 45465ea..3154ead 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -56,7 +56,7 @@ RSRCS =
# - if your library does not follow the standard library naming scheme,
# you need to specify the path to the library and it's name.
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
-LIBS = be translation
+LIBS = be translation $(STDCPPLIBS)
# Specify additional paths to directories following the standard libXXX.so
# or libXXX.a naming scheme. You can specify full paths or paths relative
diff --git a/src/ai.h b/src/ai.h
index 57d445c..863ce50 100644
--- a/src/ai.h
+++ b/src/ai.h
@@ -4,7 +4,7 @@
#include "dview.h"
#include "beunit.h"
//---------------------------------------------------------------------
-typedef list<Item>::iterator ITER;
+typedef std::list<Item>::iterator ITER;
//---------------------------------------------------------------------
struct Action //A possible action
{
@@ -27,4 +27,4 @@ class MrAI //Mister AI :)
Action GetChoosenOption(); //return the action choosed by the AI
};
//---------------------------------------------------------------------
-#endif
\ No newline at end of file
+#endif
diff --git a/src/dview.h b/src/dview.h
index 4361f25..5a60fb0 100644
--- a/src/dview.h
+++ b/src/dview.h
@@ -9,8 +9,8 @@
#include "animation.h"
#include "convert.h"
//---------------------------------------------------------------------
-typedef list<Item>::iterator ITER;
-typedef list<Item>::reverse_iterator RITER;
+typedef std::list<Item>::iterator ITER;
+typedef std::list<Item>::reverse_iterator RITER;
enum BUTTONMODE{Option, Unit};
//---------------------------------------------------------------------
class DView : public BView
@@ -20,7 +20,7 @@ class DView : public BView
BBitmap* OffscreenBitmap; //to avoid flicker while drawing
BView* OffscreenView; //used by the offscreen bitmap
- list<Item> Liste; //All units are in this list
+ std::list<Item> Liste; //All units are in this list
ITER Active; //iterator to active unit
ITER Passive; //iterator to current target (passive unit)
BUTTONMODE Mode; //current button set
@@ -61,4 +61,4 @@ class DView : public BView
virtual void MouseMoved(BPoint where, uint32 transit, const BMessage *message);
};
//---------------------------------------------------------------------
-#endif
\ No newline at end of file
+#endif
--
2.15.0