From 1ff45cdd0ae918b61cf33786436856d37aa2dcfb Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 14 Nov 2016 16:10:57 +0000 Subject: - Fix build by using correct shell - Fix build on 9.x by properly using c++11 --- games/lordsawar/Makefile | 2 ++ games/lordsawar/files/patch-src_MapRenderer.cpp | 11 +++++++++++ games/lordsawar/files/patch-src_gui_stack-army-button.cpp | 11 +++++++++++ 3 files changed, 24 insertions(+) create mode 100644 games/lordsawar/files/patch-src_MapRenderer.cpp create mode 100644 games/lordsawar/files/patch-src_gui_stack-army-button.cpp diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile index a3e37f4aa76d..69c9108b1639 100644 --- a/games/lordsawar/Makefile +++ b/games/lordsawar/Makefile @@ -14,8 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib gettext gmake libarchive pkgconfig shebangfix USE_GNOME= gtkmm30 intltool libxslt USE_GSTREAMER= mm +USE_CXXSTD= c++11 INSTALLS_ICONS= yes GNU_CONFIGURE= yes SHEBANG_FILES= create-lw-file +bash_CMD= /bin/sh .include diff --git a/games/lordsawar/files/patch-src_MapRenderer.cpp b/games/lordsawar/files/patch-src_MapRenderer.cpp new file mode 100644 index 000000000000..4a1a56aa0335 --- /dev/null +++ b/games/lordsawar/files/patch-src_MapRenderer.cpp @@ -0,0 +1,11 @@ +--- src/MapRenderer.cpp.orig 2015-06-10 18:06:19 UTC ++++ src/MapRenderer.cpp +@@ -72,7 +72,7 @@ void MapRenderer::render_tile(VectorgetImage() == false) ++ if (!style->getImage()) + { + printf ("pic for style %d for tile %d at %d,%d is null\n", + style->getType(), mtile->getType(), tile.x, tile.y); diff --git a/games/lordsawar/files/patch-src_gui_stack-army-button.cpp b/games/lordsawar/files/patch-src_gui_stack-army-button.cpp new file mode 100644 index 000000000000..bb3a815d245d --- /dev/null +++ b/games/lordsawar/files/patch-src_gui_stack-army-button.cpp @@ -0,0 +1,11 @@ +--- src/gui/stack-army-button.cpp.orig 2015-06-20 22:48:43 UTC ++++ src/gui/stack-army-button.cpp +@@ -146,7 +146,7 @@ void StackArmyButton::fill_army_button() + { + bool greyed_out = false; + Stack *active_stack = p->getActivestack(); +- if (active_stack->getArmyById(d_army->getId()) == false) ++ if (!active_stack->getArmyById(d_army->getId())) + greyed_out = true; + army_image->property_pixbuf() = + gc->getCircledArmyPic(p->getArmyset(), d_army->getTypeId(), -- cgit v1.2.3