diff options
author | joerg <joerg@pkgsrc.org> | 2017-09-25 22:32:16 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2017-09-25 22:32:16 +0000 |
commit | b8f7ef993fec46d8990078c2012e4df745ae1608 (patch) | |
tree | 91bf1ffe4c18e30f3d682da2652dda60fb6ae23b /games | |
parent | a3e94e131003249f6673d9ae36b40a8118ac7fdd (diff) | |
download | pkgsrc-b8f7ef993fec46d8990078c2012e4df745ae1608.tar.gz |
Fix format string use. Unbreak build against current Boost.
Diffstat (limited to 'games')
-rw-r--r-- | games/bastet/Makefile | 4 | ||||
-rw-r--r-- | games/bastet/distinfo | 4 | ||||
-rw-r--r-- | games/bastet/patches/patch-BastetBlockChooser.hpp | 24 | ||||
-rw-r--r-- | games/bastet/patches/patch-Ui.cpp | 51 |
4 files changed, 80 insertions, 3 deletions
diff --git a/games/bastet/Makefile b/games/bastet/Makefile index 6dd4ce42a3f..669092fda9f 100644 --- a/games/bastet/Makefile +++ b/games/bastet/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2017/08/24 20:03:13 adam Exp $ +# $NetBSD: Makefile,v 1.13 2017/09/25 22:32:16 joerg Exp $ DISTNAME= bastet-0.43.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=fph/} diff --git a/games/bastet/distinfo b/games/bastet/distinfo index beae155cf0f..891adcdee7a 100644 --- a/games/bastet/distinfo +++ b/games/bastet/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.7 2016/12/22 11:36:35 joerg Exp $ +$NetBSD: distinfo,v 1.8 2017/09/25 22:32:16 joerg Exp $ SHA1 (bastet-0.43.1.tar.gz) = 003e342df526211a9a811c2235a02b2d8288e020 RMD160 (bastet-0.43.1.tar.gz) = dde16fd74747bbd9dcc3a9762c0e681b7c9318ce SHA512 (bastet-0.43.1.tar.gz) = b2b67cd5bcc015629bd679b2bce696bd9e944cd233c78a9d49f91d340cd57f36f17181ffee5637c5883d5d28d4a1e3378697c5015dfd1cdac55e4a893c025e6f Size (bastet-0.43.1.tar.gz) = 82802 bytes +SHA1 (patch-BastetBlockChooser.hpp) = 95aa010f8862facc6062f9be968e0975524aeed7 SHA1 (patch-Makefile) = e372e9c19166dbfb4b432e720a0c56990792297e +SHA1 (patch-Ui.cpp) = 8f8add5b848faf96f97723e0839fdf457b20eb9a SHA1 (patch-Well.hpp) = d4f84a24f39aae1a84d62ad3e33fb9466dc2bbbe diff --git a/games/bastet/patches/patch-BastetBlockChooser.hpp b/games/bastet/patches/patch-BastetBlockChooser.hpp new file mode 100644 index 00000000000..c1cf805c57f --- /dev/null +++ b/games/bastet/patches/patch-BastetBlockChooser.hpp @@ -0,0 +1,24 @@ +$NetBSD: patch-BastetBlockChooser.hpp,v 1.1 2017/09/25 22:32:16 joerg Exp $ + +tr1 has been removed in boost. + +--- BastetBlockChooser.hpp.orig 2017-09-25 11:55:27.036704403 +0000 ++++ BastetBlockChooser.hpp +@@ -23,7 +23,7 @@ + + #include "Well.hpp" + +-#include <boost/tr1/tr1/unordered_set> ++#include <boost/unordered_set.hpp> + #include <set> + #include <boost/functional/hash.hpp> + +@@ -75,7 +75,7 @@ namespace Bastet{ + public: + Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor); + private: +- std::tr1::unordered_set<Vertex> _visited; ++ boost::unordered_set<Vertex> _visited; + //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts + BlockType _block; + const Well *_well; diff --git a/games/bastet/patches/patch-Ui.cpp b/games/bastet/patches/patch-Ui.cpp new file mode 100644 index 00000000000..69cf15eaacb --- /dev/null +++ b/games/bastet/patches/patch-Ui.cpp @@ -0,0 +1,51 @@ +$NetBSD: patch-Ui.cpp,v 1.1 2017/09/25 22:32:16 joerg Exp $ + +Use format strings. + +--- Ui.cpp.orig 2017-09-25 11:56:25.934814498 +0000 ++++ Ui.cpp +@@ -183,7 +183,7 @@ namespace Bastet{ + + BorderedWindow w(d.y,d.x); + wattrset((WINDOW *)w,COLOR_PAIR(20)); +- mvwprintw(w,0,0,message.c_str()); ++ mvwprintw(w,0,0,"%s", message.c_str()); + w.RedrawBorder(); + wrefresh(w); + PrepareUiGetch(); +@@ -200,7 +200,7 @@ namespace Bastet{ + d.y+=3; + BorderedWindow w(d.y,d.x); + wattrset((WINDOW *)w,COLOR_PAIR(20)); +- mvwprintw(w,0,0,message.c_str()); ++ mvwprintw(w,0,0,"%s",message.c_str()); + w.RedrawBorder(); + wrefresh(w); + PrepareUiGetch(); +@@ -221,7 +221,7 @@ namespace Bastet{ + + BorderedWindow w(d.y,d.x); + wattrset((WINDOW *)w,COLOR_PAIR(20)); +- mvwprintw(w,0,0,message.c_str()); ++ mvwprintw(w,0,0,"%s", message.c_str()); + w.RedrawBorder(); + wrefresh(w); + PrepareUiGetch(); +@@ -239,7 +239,7 @@ namespace Bastet{ + BorderedWindow w(d.y,d.x); + wattrset((WINDOW *)w,COLOR_PAIR(20)); + for(size_t i=0;i<choices.size();++i){ +- mvwprintw(w,i,4,choices[i].c_str()); ++ mvwprintw(w,i,4,"%s", choices[i].c_str()); + } + w.RedrawBorder(); + wrefresh(w); +@@ -290,7 +290,7 @@ namespace Bastet{ + Dot d=BoundingRect(msg ); + BorderedWindow w(d.y,d.x); + wattrset((WINDOW *)w,COLOR_PAIR(20)); +- mvwprintw(w,0,0,msg.c_str()); ++ mvwprintw(w,0,0,"%s", msg.c_str()); + w.RedrawBorder(); + ch=getch(); + switch(ch){ |