[Gsrc-commit] trunk r4468: motti, new patch, now it compiles and works

[Carl Hansen]

------------------------------------------------------------
revno: 4468
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Thu 2017-05-04 00:43:18 -0700
message:
  motti, new patch, now it compiles and works
removed:
  pkg/gnu/motti/files/motti-3.0.0-fix-build.diff 
motti3.0.0fixbuild.d-20160617014725-uokjfnggs70iry9h-2217
added:
  pkg/gnu/motti/files/GamePersistanceService.cpp.patch 
gamepersistanceservi-20170504074230-o7cei9d4gzfu0wlj-1
modified:
  pkg/gnu/motti/Makefile         makefile-20160617014725-uokjfnggs70iry9h-1409
  pkg/gnu/motti/sha256sums       sha256sums-20160617014725-uokjfnggs70iry9h-1415

=== modified file 'pkg/gnu/motti/Makefile'
--- a/pkg/gnu/motti/Makefile    2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/motti/Makefile    2017-05-04 07:43:18 +0000
@@ -1,4 +1,5 @@
 # Copyright © 2013, 2014 Brandon Invergo <address@hidden>
+# Copyright © 2017 Carl Hansen <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -14,6 +15,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# bugs, discussion: address@hidden
+#
+# Note, this program compiles, but doesn't install correctly. It
+# puts binary in $(prefix)/bin/games/
+# This will be fixed when I figure it out. see address@hidden
 
 NAME = Motti
 GARNAME = motti
@@ -23,7 +31,7 @@
 define BLURB
 GNU Motti is a simple multiplayer strategy game played in a terminal.
 The objective of the game is to conquer enemy capitals by occupying and
-encircling territory.
+encircling territory. Now works, with patch.
 endef
 
 ######################################################################
@@ -32,6 +40,7 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = GamePersistanceService.cpp.patch
 
 BUILDDEPS =
 LIBDEPS =

=== added file 'pkg/gnu/motti/files/GamePersistanceService.cpp.patch'
--- a/pkg/gnu/motti/files/GamePersistanceService.cpp.patch      1970-01-01 
00:00:00 +0000
+++ b/pkg/gnu/motti/files/GamePersistanceService.cpp.patch      2017-05-04 
07:43:18 +0000
@@ -0,0 +1,67 @@
+*** work/motti-3.1.0/otti/GamePersistanceService.cpp   2014-03-28 
13:22:07.000000000 -0700
+--- worknew/motti-3.1.0/otti/GamePersistanceService.cpp        2017-05-03 
23:24:00.783511716 -0700
+***************
+*** 155,161 ****
+  std::string ListGames::internalDispatch(std::string msg,std::string session){
+    std::vector<std::string> list=GamePersistanceService::loads();
+    std::stringstream ss;
+!   ss<"[";
+    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
+    {
+      std::cout<<*it<<std::endl;
+--- 155,161 ----
+  std::string ListGames::internalDispatch(std::string msg,std::string session){
+    std::vector<std::string> list=GamePersistanceService::loads();
+    std::stringstream ss;
+!   ss<<"[";
+    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
+    {
+      std::cout<<*it<<std::endl;
+***************
+*** 163,169 ****
+        ss<<",";
+      ss<<*it;
+    }
+!   ss<"]";
+    return ss.str();
+  }
+  
+--- 163,169 ----
+        ss<<",";
+      ss<<*it;
+    }
+!   ss<<"]";
+    return ss.str();
+  }
+  
+***************
+*** 171,184 ****
+    std::string user=SessionService::retrieveUserFromSession(session);
+    std::vector<std::string> list=GamePersistanceService::loads(user);
+    std::stringstream ss;
+!   ss<"[";
+    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
+    {
+      if (it!=list.begin())
+        ss<<",";
+      ss<<*it;
+    }
+!   ss<"]";
+    return ss.str();
+  }
+  
+--- 171,184 ----
+    std::string user=SessionService::retrieveUserFromSession(session);
+    std::vector<std::string> list=GamePersistanceService::loads(user);
+    std::stringstream ss;
+!   ss<<"[";
+    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
+    {
+      if (it!=list.begin())
+        ss<<",";
+      ss<<*it;
+    }
+!   ss<<"]";
+    return ss.str();
+  }
+  

=== removed file 'pkg/gnu/motti/files/motti-3.0.0-fix-build.diff'
--- a/pkg/gnu/motti/files/motti-3.0.0-fix-build.diff    2016-06-17 19:08:15 
+0000
+++ b/pkg/gnu/motti/files/motti-3.0.0-fix-build.diff    1970-01-01 00:00:00 
+0000
@@ -1,11 +0,0 @@
-diff -x config.log -x config.status -ru work/motti-3.0.0/otti/StringDrawer.cpp 
work/motti-3.0.0/otti/StringDrawer.cpp
---- work/motti-3.0.0/otti/StringDrawer.cpp     2010-07-10 17:27:00.000000000 
+0000
-+++ work/motti-3.0.0/otti/StringDrawer.cpp     2012-11-17 16:33:52.687257525 
+0000
-@@ -17,6 +17,7 @@
- */
- #include "StdAfx.h"
- #include "StringDrawer.h"
-+#include <unistd.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <string>

=== modified file 'pkg/gnu/motti/sha256sums'
--- a/pkg/gnu/motti/sha256sums  2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/motti/sha256sums  2017-05-04 07:43:18 +0000
@@ -1,2 +1,3 @@
 ced690665c05711b60dc8fc0841d12eae5da9104a16f32ef0f83cf30335fb09b  
download/motti-3.1.0.tar.gz
+46af16a00d84257659e7f388f4f9ad8bb935a1bb5c6cce766d9df3e72d87819d  
download/GamePersistanceService.cpp.patch
 79075c82f343040e1a65fa97232839bd96935f773a750a34dc7b35935b8e2481  
download/motti-3.1.0.tar.gz.sig