Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Nov 2016 16:10:57 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426117 - in head/games/lordsawar: . files
Message-ID:  <201611141610.uAEGAvi1058329@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Nov 14 16:10:57 2016
New Revision: 426117
URL: https://svnweb.freebsd.org/changeset/ports/426117

Log:
  - Fix build by using correct shell
  - Fix build on 9.x by properly using c++11

Added:
  head/games/lordsawar/files/patch-src_MapRenderer.cpp   (contents, props changed)
  head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp   (contents, props changed)
Modified:
  head/games/lordsawar/Makefile

Modified: head/games/lordsawar/Makefile
==============================================================================
--- head/games/lordsawar/Makefile	Mon Nov 14 15:52:18 2016	(r426116)
+++ head/games/lordsawar/Makefile	Mon Nov 14 16:10:57 2016	(r426117)
@@ -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 <bsd.port.mk>

Added: head/games/lordsawar/files/patch-src_MapRenderer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/lordsawar/files/patch-src_MapRenderer.cpp	Mon Nov 14 16:10:57 2016	(r426117)
@@ -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(Vector<int
+     }
+   else
+     {
+-      if (style->getImage() == 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);

Added: head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp	Mon Nov 14 16:10:57 2016	(r426117)
@@ -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(),



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611141610.uAEGAvi1058329>