Mon Sep 25 22:32:17 2017 UTC ()
Fix format string use. Unbreak build against current Boost.
(joerg)
diff -r1.12 -r1.13 pkgsrc/games/bastet/Makefile
diff -r1.7 -r1.8 pkgsrc/games/bastet/distinfo
diff -r0 -r1.1 pkgsrc/games/bastet/patches/patch-BastetBlockChooser.hpp
diff -r0 -r1.1 pkgsrc/games/bastet/patches/patch-Ui.cpp
--- pkgsrc/games/bastet/Makefile 2017/08/24 20:03:13 1.12
+++ pkgsrc/games/bastet/Makefile 2017/09/25 22:32:16 1.13
| @@ -1,17 +1,17 @@ | | | @@ -1,17 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.12 2017/08/24 20:03:13 adam Exp $ | | 1 | # $NetBSD: Makefile,v 1.13 2017/09/25 22:32:16 joerg Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= bastet-0.43.1 | | 3 | DISTNAME= bastet-0.43.1 |
| 4 | PKGREVISION= 3 | | 4 | PKGREVISION= 4 |
| 5 | CATEGORIES= games | | 5 | CATEGORIES= games |
| 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=fph/} | | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=fph/} |
| 7 | | | 7 | |
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | | 8 | MAINTAINER= pkgsrc-users@NetBSD.org |
| 9 | HOMEPAGE= http://fph.altervista.org/prog/bastet.html | | 9 | HOMEPAGE= http://fph.altervista.org/prog/bastet.html |
| 10 | COMMENT= Bastard Tetris | | 10 | COMMENT= Bastard Tetris |
| 11 | LICENSE= gnu-gpl-v3 | | 11 | LICENSE= gnu-gpl-v3 |
| 12 | | | 12 | |
| 13 | USE_TOOLS+= gmake | | 13 | USE_TOOLS+= gmake |
| 14 | BUILD_DEFS+= VARBASE | | 14 | BUILD_DEFS+= VARBASE |
| 15 | | | 15 | |
| 16 | USE_GAMESGROUP= yes | | 16 | USE_GAMESGROUP= yes |
| 17 | SPECIAL_PERMS= bin/bastet ${SETGID_GAMES_PERMS} | | 17 | SPECIAL_PERMS= bin/bastet ${SETGID_GAMES_PERMS} |
--- pkgsrc/games/bastet/distinfo 2016/12/22 11:36:35 1.7
+++ pkgsrc/games/bastet/distinfo 2017/09/25 22:32:16 1.8
| @@ -1,8 +1,10 @@ | | | @@ -1,8 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.7 2016/12/22 11:36:35 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.8 2017/09/25 22:32:16 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (bastet-0.43.1.tar.gz) = 003e342df526211a9a811c2235a02b2d8288e020 | | 3 | SHA1 (bastet-0.43.1.tar.gz) = 003e342df526211a9a811c2235a02b2d8288e020 |
| 4 | RMD160 (bastet-0.43.1.tar.gz) = dde16fd74747bbd9dcc3a9762c0e681b7c9318ce | | 4 | RMD160 (bastet-0.43.1.tar.gz) = dde16fd74747bbd9dcc3a9762c0e681b7c9318ce |
| 5 | SHA512 (bastet-0.43.1.tar.gz) = b2b67cd5bcc015629bd679b2bce696bd9e944cd233c78a9d49f91d340cd57f36f17181ffee5637c5883d5d28d4a1e3378697c5015dfd1cdac55e4a893c025e6f | | 5 | SHA512 (bastet-0.43.1.tar.gz) = b2b67cd5bcc015629bd679b2bce696bd9e944cd233c78a9d49f91d340cd57f36f17181ffee5637c5883d5d28d4a1e3378697c5015dfd1cdac55e4a893c025e6f |
| 6 | Size (bastet-0.43.1.tar.gz) = 82802 bytes | | 6 | Size (bastet-0.43.1.tar.gz) = 82802 bytes |
| | | 7 | SHA1 (patch-BastetBlockChooser.hpp) = 95aa010f8862facc6062f9be968e0975524aeed7 |
| 7 | SHA1 (patch-Makefile) = e372e9c19166dbfb4b432e720a0c56990792297e | | 8 | SHA1 (patch-Makefile) = e372e9c19166dbfb4b432e720a0c56990792297e |
| | | 9 | SHA1 (patch-Ui.cpp) = 8f8add5b848faf96f97723e0839fdf457b20eb9a |
| 8 | SHA1 (patch-Well.hpp) = d4f84a24f39aae1a84d62ad3e33fb9466dc2bbbe | | 10 | SHA1 (patch-Well.hpp) = d4f84a24f39aae1a84d62ad3e33fb9466dc2bbbe |
$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;
$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){