diff --git a/haiku-apps/genesis_commander/genesis_commander-0.42.recipe b/haiku-apps/genesis_commander/genesis_commander-0.42.recipe index ad6a43660..63ea6542c 100644 --- a/haiku-apps/genesis_commander/genesis_commander-0.42.recipe +++ b/haiku-apps/genesis_commander/genesis_commander-0.42.recipe @@ -9,7 +9,7 @@ SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="af9b44278203c0abcda6543d016ae2657ad347b6eaf533af1e85fca00f49f3d3" SOURCE_DIR="GenesisCommander-$srcGitRev" -ARCHITECTURES="x86_gcc2 x86 !x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" genesis_commander = $portVersion diff --git a/haiku-apps/timetracker/patches/timetracker-0.2.patchset b/haiku-apps/timetracker/patches/timetracker-0.2.patchset new file mode 100644 index 000000000..dddc9d58e --- /dev/null +++ b/haiku-apps/timetracker/patches/timetracker-0.2.patchset @@ -0,0 +1,48 @@ +From 643f6cbd6106b72c0d5cc17af33ffbaf73430b11 Mon Sep 17 00:00:00 2001 +From: nys <33534144+nysnatuss@users.noreply.github.com> +Date: Sun, 31 Dec 2017 23:13:38 +0000 +Subject: patch for x86_64 + + +diff --git a/src/Makefile b/src/Makefile +index b231dc7..f19ba30 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -59,7 +59,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 ++LIBS = be $(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/TaskListItem.cpp b/src/TaskListItem.cpp +index 3381344..134e00d 100644 +--- a/src/TaskListItem.cpp ++++ b/src/TaskListItem.cpp +@@ -47,7 +47,7 @@ TaskListItem::GetTime() + + void + TaskListItem::DrawItem(BView* owner, BRect itemRect, +- bool drawEverything = false) ++ bool drawEverything) + { + // colors + rgb_color background = tint_color(ui_color(B_LIST_BACKGROUND_COLOR), 1.08); +diff --git a/src/TimeTrackerWindow.cpp b/src/TimeTrackerWindow.cpp +index d0eabe8..187cbf4 100644 +--- a/src/TimeTrackerWindow.cpp ++++ b/src/TimeTrackerWindow.cpp +@@ -200,7 +200,7 @@ TimeTrackerWindow::LoadTasks() + char Buffer[255]; + sprintf(Buffer, "Task%d", pos); + const char* TaskName; +- TaskName = Tasks.FindString(Buffer, 0L); ++ TaskName = Tasks.FindString(Buffer, 0); + if (TaskName != NULL) { + sprintf(Buffer, "TaskTime%d", pos); + bigtime_t* time; +-- +2.15.0 + diff --git a/haiku-apps/timetracker/timetracker-0.2.recipe b/haiku-apps/timetracker/timetracker-0.2.recipe index 06a1be282..9c92c98bb 100644 --- a/haiku-apps/timetracker/timetracker-0.2.recipe +++ b/haiku-apps/timetracker/timetracker-0.2.recipe @@ -11,8 +11,11 @@ REVISION="1" SOURCE_URI="https://github.com/HaikuArchives/TimeTracker/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="eeef96d6ccccf580497787b0c68ba6014c4985553266027c86cd0aff16037857" SOURCE_DIR="TimeTracker-$portVersion" +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + PATCHES="timetracker-$portVersion.patchset" +fi -ARCHITECTURES="x86_gcc2 !x86 !x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" timetracker = $portVersion diff --git a/haiku-apps/toner/patches/toner-1.0.0.patchset b/haiku-apps/toner/patches/toner-1.0.0.patchset new file mode 100644 index 000000000..c540f89aa --- /dev/null +++ b/haiku-apps/toner/patches/toner-1.0.0.patchset @@ -0,0 +1,22 @@ +From 6457dc4044955ea45fc47fe47cfc6884c70b7bad Mon Sep 17 00:00:00 2001 +From: nys <33534144+nysnatuss@users.noreply.github.com> +Date: Sun, 31 Dec 2017 22:08:08 +0000 +Subject: link C++ in Makefile + + +diff --git a/Makefile b/Makefile +index 11401fa..541a6ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -54,7 +54,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 root media game translation ++LIBS = be root media game 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 +-- +2.15.0 + diff --git a/haiku-apps/toner/toner-1.0.0.recipe b/haiku-apps/toner/toner-1.0.0.recipe index feaa8d9a8..5fa0b559a 100644 --- a/haiku-apps/toner/toner-1.0.0.recipe +++ b/haiku-apps/toner/toner-1.0.0.recipe @@ -4,13 +4,14 @@ system." HOMEPAGE="https://github.com/HaikuArchives/Toner" COPYRIGHT="2001 Ben Loftis" LICENSE="MIT" -REVISION="1" +REVISION="2" COMMIT="eb78098c88b0d1eacb97a4e0085eff6bfd0a7f0b" SOURCE_URI="https://github.com/HaikuArchives/Toner/archive/$COMMIT.tar.gz" CHECKSUM_SHA256="9a3edf2de7436a33ce7706ad1347cbd3393e906c735ca097b42ded584e3e8a5f" SOURCE_DIR="Toner-$COMMIT" +PATCHES="toner-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 !x86 !x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" toner = $portVersion diff --git a/haiku-apps/wakeup/patches/wakeup-1.0.patchset b/haiku-apps/wakeup/patches/wakeup-1.0.patchset new file mode 100644 index 000000000..162afd22d --- /dev/null +++ b/haiku-apps/wakeup/patches/wakeup-1.0.patchset @@ -0,0 +1,22 @@ +From 2c07d5e62251affb6328ea509106d2417b522f06 Mon Sep 17 00:00:00 2001 +From: nys <33534144+nysnatuss@users.noreply.github.com> +Date: Sun, 31 Dec 2017 22:42:12 +0000 +Subject: link C++ libs; fix for x86_64 + + +diff --git a/Makefile b/Makefile +index bdaec11..42618bd 100644 +--- a/Makefile ++++ b/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 game ++LIBS = be game $(STDCPPLIBS) + + # Specify additional paths to directories following the standard libXXX.so + # or libXXX.a naming scheme. You can specify full paths or paths relative +-- +2.15.0 + diff --git a/haiku-apps/wakeup/wakeup-1.0.recipe b/haiku-apps/wakeup/wakeup-1.0.recipe index 0d406279d..ac52473c9 100644 --- a/haiku-apps/wakeup/wakeup-1.0.recipe +++ b/haiku-apps/wakeup/wakeup-1.0.recipe @@ -6,14 +6,15 @@ like an alarm clock or a cooking timer, just to name a few." HOMEPAGE="https://github.com/HaikuArchives/WakeUp" COPYRIGHT="1999 Jonathan Villemure" LICENSE="MIT" -REVISION="1" +REVISION="2" gitSrcRevision="116afedea73ba9779d3d641028b65fdb2dc19012" SOURCE_URI="https://github.com/HaikuArchives/WakeUp/archive/$gitSrcRevision.tar.gz" CHECKSUM_SHA256="28eb8504a2a436a117821aaa399b8c37f5363bd9fcb2ff814f6cb1b6264da311" SOURCE_FILENAME="WakeUp-$gitSrcRevision.tar.gz" SOURCE_DIR="WakeUp-$gitSrcRevision" +PATCHES="wakeup-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 !x86_64" +ARCHITECTURES="x86_gcc2 x86_64" PROVIDES=" wakeup = $portVersion diff --git a/haiku-games/bebattle/bebattle-1.0.0.recipe b/haiku-games/bebattle/bebattle-1.0.0.recipe index 92aa5042c..9412600ab 100644 --- a/haiku-games/bebattle/bebattle-1.0.0.recipe +++ b/haiku-games/bebattle/bebattle-1.0.0.recipe @@ -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 diff --git a/haiku-games/bebattle/patches/bebattle-1.0.0.patchset b/haiku-games/bebattle/patches/bebattle-1.0.0.patchset new file mode 100644 index 000000000..b12e8a583 --- /dev/null +++ b/haiku-games/bebattle/patches/bebattle-1.0.0.patchset @@ -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::iterator ITER; ++typedef std::list::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::iterator ITER; +-typedef list::reverse_iterator RITER; ++typedef std::list::iterator ITER; ++typedef std::list::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 Liste; //All units are in this list ++ std::list 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 +