<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fa5ddbe163b95ca404c64837a091b6b63eaebc3f">https://github.com/macports/macports-ports/commit/fa5ddbe163b95ca404c64837a091b6b63eaebc3f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fa5ddbe raceintospace: Update to 1.1-20170605
</span>fa5ddbe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fa5ddbe163b95ca404c64837a091b6b63eaebc3f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 15 11:18:52 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> raceintospace: Update to 1.1-20170605
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/30510
</span>---
games/raceintospace/Portfile | 53 +++++++++++++-------------
games/raceintospace/files/CMakeLists.txt.patch | 53 ++++++++++++++++++++++++++
games/raceintospace/files/Global.cmake.patch | 19 +++++++++
games/raceintospace/files/Makefile.in.diff | 12 ------
games/raceintospace/files/jsoncpp.patch | 42 ++++++++++++++++++++
5 files changed, 140 insertions(+), 39 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/Portfile b/games/raceintospace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc5bcd6..23ab58f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/raceintospace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +1,46 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name raceintospace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup raceintospace raceintospace e0d423d40747a06094b7ea441b0d63ca345c9a27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1-20170605
</span> categories games
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span>
description Open Source version of old MS-DOS game Buzz Aldrin's Race Into Space
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://raceintospace.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/${name}/Race%20Into%20Space/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.raceintospace.org
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set source_file ${distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set data_file ${name}-data-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8989a36c664927b057cf789de4a0fab07a8a7876 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee106089d90aa53ebbfd9854a6b57883510fc2f58d3b0f481c8ad859b9133faa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 63501320
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${source_file} ${data_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${source_file} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 e7987f9a26c61fc0fe50833fdd41ffa1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 abe71d9ee14254662fd671cb9a5479df298a934f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d5cca12d65a8b6b998186c310bac51da0987f6ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${data_file} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 618f3d68f6d2d49567b34e09c143221b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 4d8866239be5319f6a77e276c42bac0b0f1ff764 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2865debe15e60ee1870eee78e625a4b9e082b869
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:jsoncpp \
</span> port:libogg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span> port:libvorbis \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtheora
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:physfs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles CMakeLists.txt.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Global.cmake.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jsoncpp.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-sdltest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/local|@PREFIX@|g" ${worksrcpath}/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move the game data into the destroot directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {audio gamedata images video} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${workpath}/${dir} ${destroot}${prefix}/share/raceintospace/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy "${build.dir}/Race Into Space.app" ${destroot}${applications_dir}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/CMakeLists.txt.patch b/games/raceintospace/files/CMakeLists.txt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1157375
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add BUILD_PHYSFS flag to select whether to build a local copy of physfs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/CMakeLists.txt.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/CMakeLists.txt 2018-03-15 10:36:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,27 +121,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PhysicsFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# I want 2.1 features, even if they're not out yet, so I made my own tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#set (physfs_Version 2.0.3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#set (physfs_URL http://icculus.org/physfs/downloads/physfs-${physfs_Version}.tar.bz2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set (physfs_Version 2.1.0-pre20121013)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set (physfs_URL https://s3.amazonaws.com/willglynn/physfs-${physfs_Version}.tgz)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set (physfs_Dir ${CMAKE_CURRENT_BINARY_DIR}/physfs-${physfs_Version})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# physfs 2.0.3 complains about FSPathMakeRef et al being deprecated, and warnings are treated as errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Turn it back into a warning instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set (physfs_Flags -Wno-error=deprecated-declarations)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ExternalProject_Add(ext_physfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/downloads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL ${physfs_URL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PREFIX ${physfs_Dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${LocalPrefix} -DPHYSFS_ARCHIVE_7Z=false -DPHYSFS_ARCHIVE_GRP=false -DPHYSFS_ARCHIVE_WAD=false -DPHYSFS_ARCHIVE_HOG=false -DPHYSFS_ARCHIVE_MVL=false -DPHYSFS_ARCHIVE_QPAK=false -DPHYSFS_ARCHIVE_ISO9660=false -DPHYSFS_HAVE_CDROM_SUPPORT=false -DPHYSFS_BUILD_SHARED=false -DPHYSFS_BUILD_TEST=false -DCMAKE_C_FLAGS=${physfs_Flags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF (BUILD_PHYSFS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # I want 2.1 features, even if they're not out yet, so I made my own tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #set (physfs_Version 2.0.3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #set (physfs_URL http://icculus.org/physfs/downloads/physfs-${physfs_Version}.tar.bz2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (physfs_Version 2.1.0-pre20121013)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (physfs_URL https://s3.amazonaws.com/willglynn/physfs-${physfs_Version}.tgz)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (physfs_Dir ${CMAKE_CURRENT_BINARY_DIR}/physfs-${physfs_Version})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # physfs 2.0.3 complains about FSPathMakeRef et al being deprecated, and warnings are treated as errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Turn it back into a warning instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (physfs_Flags -Wno-error=deprecated-declarations)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_dependencies(libs ext_physfs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ExternalProject_Add(ext_physfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/downloads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ URL ${physfs_URL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PREFIX ${physfs_Dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${LocalPrefix} -DPHYSFS_ARCHIVE_7Z=false -DPHYSFS_ARCHIVE_GRP=false -DPHYSFS_ARCHIVE_WAD=false -DPHYSFS_ARCHIVE_HOG=false -DPHYSFS_ARCHIVE_MVL=false -DPHYSFS_ARCHIVE_QPAK=false -DPHYSFS_ARCHIVE_ISO9660=false -DPHYSFS_HAVE_CDROM_SUPPORT=false -DPHYSFS_BUILD_SHARED=false -DPHYSFS_BUILD_TEST=false -DCMAKE_C_FLAGS=${physfs_Flags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_dependencies(libs ext_physfs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif (BUILD_PHYSFS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/Global.cmake.patch b/games/raceintospace/files/Global.cmake.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a747688
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/Global.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not build local copies of any of the dependencies on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(We use the MacPorts versions of them.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Global.cmake.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Global.cmake 2018-03-15 11:05:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,12 +9,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_directories(${LocalPrefix}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set flags indicating what we should build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BUILD_JSONCPP true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BUILD_XIPH true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BUILD_PROTOBUF true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BUILD_LIBPNG true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif (WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(BUILD_PHYSFS true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_JSONCPP true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_ZLIB true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_LIBPNG true)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/Makefile.in.diff b/games/raceintospace/files/Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6100f31..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/raceintospace/files/Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2007-07-26 01:10:36.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2011-08-01 20:30:42.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,8 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_FLAGS = -I m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_WARNINGS = -Wextra -Wno-unused-parameter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-char-subscripts -Wno-deprecated-declarations \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Werror
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wno-char-subscripts -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROGS = $(addsuffix @EXEEXT@, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- imgsplit vtest decode getport getvab mtest sdltest vtest2)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/jsoncpp.patch b/games/raceintospace/files/jsoncpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..24dc743
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/jsoncpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix include path for jsoncpp.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/game/roster.cpp.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/game/roster.cpp 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/foreach.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/game/roster_entry.h.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/game/roster_entry.h 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef ROSTER_ENTRY_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ROSTER_ENTRY_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "data.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/game/roster_group.h.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/game/roster_group.h 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef ROSTER_GROUP_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ROSTER_GROUP_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <list>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/utils/data_decoder.cpp.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/utils/data_decoder.cpp 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void print_escaped_string(const char *string, int max_length)
</span></pre><pre style='margin:0'>
</pre>