<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/865d6d250d34922f5a9294eb1d4ca51195fa61e9">https://github.com/macports/macports-ports/commit/865d6d250d34922f5a9294eb1d4ca51195fa61e9</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 865d6d2 glob2: Update to 0.9.4.4 and fix many problems
</span>865d6d2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 865d6d250d34922f5a9294eb1d4ca51195fa61e9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Oct 18 02:28:54 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> glob2: Update to 0.9.4.4 and fix many problems
</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/35022
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55843
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55844
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55845
</span>---
games/glob2/Portfile | 87 +++++++++++++++++++---------
games/glob2/files/BuildProject.patch | 22 +++++++
games/glob2/files/CoreFoundation.patch | 14 +++++
games/glob2/files/Glob2.icns | Bin 0 -> 35456 bytes
games/glob2/files/Info.plist | 26 +++++++++
games/glob2/files/SConstruct.patch | 98 ++++++++++++++++++++++++++++++++
games/glob2/files/bundle.patch | 12 ++++
games/glob2/files/iostream.patch | 13 +++++
games/glob2/files/patch-SConstruct.diff | 44 --------------
9 files changed, 246 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/Portfile b/games/glob2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eea2558..43327ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/glob2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name glob2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c0f1c2534eeb95bb901bc61a462495183f191be2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11338986
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 2] .]
</span> categories games
license GPL-3+
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Globulation 2 - a free and innovative strategy game
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> long_description Globulation 2 is an innovative high quality Real-Time \
Strategy, which minimizes micro-management by \
automatically assigning tasks to the units. The player \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,15 +28,15 @@ long_description Globulation 2 is an innovative high quality Real-Time \
</span> features a scripting language for versatile gameplay or \
tutorials and an integrated map editor.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://globulation2.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://dl.sv.nongnu.org/releases/glob2/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 e0483d5864cff4ace5ac8e39eae27429 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 669a43707cf03e4e810e77ef8bef2f46f1116090 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 266edd6a57f1e8ea8e1effac3871f3c0083fc05f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://globulation2.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://dl.sv.nongnu.org/releases/glob2/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:scons
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:scons
</span> depends_lib port:boost \
port:freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fribidi \
</span> port:jpeg \
port:libiconv \
port:libogg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,33 +45,60 @@ depends_lib port:boost \
</span> port:libsdl_image \
port:libsdl_net \
port:libsdl_ttf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libvorbis\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:portaudio \
</span> path:lib/libspeex.dylib:speex \
port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Files missing in tarball; downloaded from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bitbucket.org/giszmo/glob2/src/7f98290bab5c5f5c4194b2aa7ae26c992ccef6d1/darwin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with these changes to the Info.plist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * CFBundleVersion changed from hardcoded outdated version to @VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * CFBundleShortVersionString added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * NSHighResolutionCapable added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${worksrcpath}/darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${filespath} -m 0644 Glob2.icns Info.plist ${worksrcpath}/darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/darwin/Info.plist
</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;'>+patchfiles-append BuildProject.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append bundle.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append CoreFoundation.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append iostream.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append SConstruct.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set buildoptions "BINDIR=\"${destroot}${prefix}/bin\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALLDIR=\"${destroot}${prefix}/share\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DATADIR=\"${prefix}/share/glob2\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS=\"-I${prefix}/include\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINKFLAGS=\"-L${prefix}/lib\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The destroot directories must be created here so scons can find them
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # during the build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span>
build.cmd ${prefix}/bin/scons
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target $buildoptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args --portaudio=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINKFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The SConscript makes a Mac app bundle when release=1, but incorrectly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# attempts to do so before building anything, which of course fails.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So don't use release=1 in the build phase, but do use it in destroot.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ release=1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target "install $buildoptions"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/Glob2.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Using a symlink doesn't work because the app can't find its data files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${destroot}${prefix}/bin/glob2 w 0755]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} "exec \"${applications_dir}/Glob2.app/Contents/MacOS/glob2\" \"$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://globulation2.org/wiki/Download_and_Install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}/wiki/Download_and_Install
</span> livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/BuildProject.patch b/games/glob2/files/BuildProject.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..32cbcf8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/files/BuildProject.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Make Game::BuildProject public to fix "error: 'BuildProject' is a private
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+member of 'Game'".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/?47070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bitbucket.org/giszmo/glob2/commits/c4da01699846179d8bf21e8dae2b973158ec0775
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Game.h.orig 2009-08-29 15:39:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Game.h 2018-10-17 20:39:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,6 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOTTOM_TO_TOP
</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;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct BuildProject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int posX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,6 +160,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int unitWorkingFuture;
</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;'>++private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///Initiates Game
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void init(GameGUI *gui, MapEdit* edit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/CoreFoundation.patch b/games/glob2/files/CoreFoundation.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d779921
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/files/CoreFoundation.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Include CoreFoundation instead of Carbon since this code only uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CoreFoundation stuff, and including Carbon plus "using namespace boost"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+causes "error: reference to 'Collection' is ambiguous".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Glob2.cpp.orig 2009-08-29 15:39:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Glob2.cpp 2018-10-17 21:37:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/Glob2.icns b/games/glob2/files/Glob2.icns
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..403ede0
</span>Binary files /dev/null and b/games/glob2/files/Glob2.icns differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/Info.plist b/games/glob2/files/Info.plist
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ef67cbe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/files/Info.plist
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>glob2</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Glob2.icns</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleIdentifier</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>com.globulation2.Glob2</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleInfoDictionaryVersion</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>6.0</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleName</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Glob2</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundlePackageType</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleShortVersionString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@VERSION@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleVersion</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@VERSION@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSAppleScriptEnabled</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>NO</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSHighResolutionCapable</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/SConstruct.patch b/games/glob2/files/SConstruct.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0b8ec9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/files/SConstruct.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,98 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Allow CC, CXX, and CFLAGS to be specified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add linking with boost_system and fix linking with boost_date_time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.nongnu.org/bugs/?39593
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Look for dependencies in PATH.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not add Fink library and include paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix finding fribidi.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not remove duplicate flags when calling env.ParseConfig, as that turns the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"-arch x86_64 -arch i386" we pass when building universal into
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"x86_64 -arch i386" resulting in "error: no such file or directory: 'x86_64'".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Exit after building the bundle, before building the dmg and rebuilding sources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig 2009-08-30 14:23:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct 2018-10-18 00:39:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def establish_options(env):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opts = Options('options_cache.py')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ opts.Add("CC", "Manually set the C compiler", "cc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ opts.Add("CXX", "Manually set the C++ compiler", "c++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ opts.Add("CFLAGS", "Manually add to the CFLAGS", "-g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isDarwinPlatform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,13 +123,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ missing.append("libboost_thread")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(LIBS=[boost_thread])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boost_system = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if conf.CheckLib("boost_system"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boost_system="boost_system"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif conf.CheckLib("boost_system-mt"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boost_system="boost_system-mt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print "Could not find libboost_system or libboost_system-mt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ missing.append("libboost_system")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.Append(LIBS=[boost_system])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost_date_time = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if conf.CheckLib("boost_date_time") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost_thread="boost_thread"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boost_date_time="boost_date_time"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif conf.CheckLib("boost_date_time-mt") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boost_thread="boost_thread-mt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boost_date_time="boost_date_time-mt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print "Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print "Could not find libboost_date_time or libboost_date_time-mt or boost/date_time/posix_time/posix_time.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ missing.append("libboost_date_time")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(LIBS=[boost_date_time])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,7 +238,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action='store',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ metavar='portaudio',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help='should portaudio be used')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env = Environment()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env = Environment(ENV = {'PATH' : os.environ['PATH']})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Clone()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except AttributeError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,11 +254,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if env['mingw'] or isWindowsPlatform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(LIBPATH=["C:/msys/1.0/local/lib", "C:/msys/1.0/lib"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(CPPPATH=["C:/msys/1.0/local/include/SDL", "C:/msys/1.0/local/include", "C:/msys/1.0/include/SDL", "C:/msys/1.0/include"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if isDarwinPlatform:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.Append(LIBPATH=["/sw/lib"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.Append(CPPPATH=["/sw/include"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure(env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(CPPPATH=['#libgag/include', '#'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.ParseConfig("pkg-config fribidi --cflags", None, False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.ParseConfig("pkg-config fribidi --libs", None, False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configure(env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if env['release']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(CXXFLAGS=' -O2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(LINKFLAGS=' -O2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,8 +273,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(CPPPATH=['/usr/local/include/SDL'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(CPPDEFINES=['-D_GNU_SOURCE=1', '-Dmain=SDL_main'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.ParseConfig("sdl-config --cflags")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- env.ParseConfig("sdl-config --libs")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.ParseConfig("sdl-config --cflags", None, False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env.ParseConfig("sdl-config --libs", None, False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,6 +307,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_PLIST="darwin/Info.plist",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_ICON="darwin/Glob2.icns" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bundle.createBundle(os.getcwd(), os.getcwd(), env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Exit(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dmg.create_dmg("Glob2-%s"%env["VERSION"],"%s.app"%env["BUNDLE_NAME"],env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #TODO mac_bundle should be dependency of Dmg:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/bundle.patch b/games/glob2/files/bundle.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9388936
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/files/bundle.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not copy libraries into app bundle.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scons/bundle.py.orig 2009-06-14 05:11:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scons/bundle.py 2018-10-18 00:26:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,8 +30,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add icon -- TODO generate .icns file from png or svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iconFile = env['BUNDLE_ICON']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ run('cp %s %s/Contents/Resources' % (iconFile, bundleDir) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # add dependent libraries, fixing all absolute paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- addDependentLibsToBundle( bundleDir )
</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;'>+ def createBundleMessage(target, source, env) :
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/iostream.patch b/games/glob2/files/iostream.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3cac79f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/glob2/files/iostream.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The code uses iostream, not stdio.h. Failing to include iostream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+causes "error: no member named 'cout' in namespace 'std'".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/VoiceRecorder.cpp.orig 2009-08-29 15:39:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/VoiceRecorder.cpp 2018-10-17 21:46:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "VoiceRecorder.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Order.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Utilities.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/glob2/files/patch-SConstruct.diff b/games/glob2/files/patch-SConstruct.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8ddc07f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/glob2/files/patch-SConstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SConstruct.orig 2008-04-08 14:33:15.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SConstruct 2010-10-25 06:53:52.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configfile.add("PACKAGE", "Name of package", "\"glob2\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configfile.add("PACKAGE_BUGREPORT", "Define to the address where bug reports for this package should be sent.", "\"glob2-devel@nongnu.org\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isDarwinPlatform:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "../Resources/\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configfile.add("PACKAGE_SOURCE_DIR", "source directory", "\"" +env.Dir("#").abspath.replace("\\", "\\\\") + "\"")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -178,7 +178,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.Finish()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def main():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- env = Environment()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ env = Environment(ENV = {'PATH' : os.environ['PATH']})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env.Clone()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except AttributeError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,23 +235,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env.Tar(target, f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PackTar(env["TARFILE"], Split("AUTHORS COPYING gen_inst_uninst_list.py INSTALL mkdist mkinstall mkuninstall README README.hg SConstruct"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #packaging for apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if isDarwinPlatform and env["release"]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bundle.generate(env)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dmg.generate(env)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- env.Replace(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BUNDLE_NAME="Glob2",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BUNDLE_BINARIES=["src/glob2"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BUNDLE_RESOURCEDIRS=["data","maps", "campaigns"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BUNDLE_PLIST="darwin/Info.plist",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BUNDLE_ICON="darwin/Glob2.icns" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bundle.createBundle(os.getcwd(), os.getcwd(), env)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dmg.create_dmg("Glob2-%s"%env["VERSION"],"%s.app"%env["BUNDLE_NAME"],env)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #TODO mac_bundle should be dependency of Dmg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- arch = os.popen("uname -p").read().strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# mac_packages = env.Dmg('Glob2-%s-%s.dmg'% (fullVersion, arch), env.Dir('Glob2.app/') )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# env.Alias("package", mac_packages)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Export('env')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Export('PackTar')
</span></pre><pre style='margin:0'>
</pre>