forked from macports/macports-ports
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
glob2: Update to 0.9.4.4 and fix many problems
Closes: https://trac.macports.org/ticket/35022 Closes: https://trac.macports.org/ticket/55843 Closes: https://trac.macports.org/ticket/55844 Closes: https://trac.macports.org/ticket/55845
- Loading branch information
1 parent
0671808
commit 865d6d2
Showing
9 changed files
with
246 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| Make Game::BuildProject public to fix "error: 'BuildProject' is a private | ||
| member of 'Game'". | ||
| https://savannah.nongnu.org/bugs/?47070 | ||
| https://bitbucket.org/giszmo/glob2/commits/c4da01699846179d8bf21e8dae2b973158ec0775 | ||
| --- src/Game.h.orig 2009-08-29 15:39:06.000000000 -0500 | ||
| +++ src/Game.h 2018-10-17 20:39:14.000000000 -0500 | ||
| @@ -149,6 +149,7 @@ | ||
| BOTTOM_TO_TOP | ||
| }; | ||
|
|
||
| +public: | ||
| struct BuildProject | ||
| { | ||
| int posX; | ||
| @@ -159,6 +160,7 @@ | ||
| int unitWorkingFuture; | ||
| }; | ||
|
|
||
| +private: | ||
| ///Initiates Game | ||
| void init(GameGUI *gui, MapEdit* edit); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| Include CoreFoundation instead of Carbon since this code only uses | ||
| CoreFoundation stuff, and including Carbon plus "using namespace boost" | ||
| causes "error: reference to 'Collection' is ambiguous". | ||
| --- src/Glob2.cpp.orig 2009-08-29 15:39:06.000000000 -0500 | ||
| +++ src/Glob2.cpp 2018-10-17 21:37:30.000000000 -0500 | ||
| @@ -62,7 +62,7 @@ | ||
| #endif | ||
|
|
||
| #ifdef __APPLE__ | ||
| -# include <Carbon/Carbon.h> | ||
| +# include <CoreFoundation/CoreFoundation.h> | ||
| # include <sys/param.h> | ||
| #endif | ||
|
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleExecutable</key> | ||
| <string>glob2</string> | ||
| <key>CFBundleIconFile</key> | ||
| <string>Glob2.icns</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>com.globulation2.Glob2</string> | ||
| <key>CFBundleInfoDictionaryVersion</key> | ||
| <string>6.0</string> | ||
| <key>CFBundleName</key> | ||
| <string>Glob2</string> | ||
| <key>CFBundlePackageType</key> | ||
| <string>APPL</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>@VERSION@</string> | ||
| <key>CFBundleVersion</key> | ||
| <string>@VERSION@</string> | ||
| <key>NSAppleScriptEnabled</key> | ||
| <string>NO</string> | ||
| <key>NSHighResolutionCapable</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| Allow CC, CXX, and CFLAGS to be specified. | ||
|
|
||
| Add linking with boost_system and fix linking with boost_date_time. | ||
| https://savannah.nongnu.org/bugs/?39593 | ||
|
|
||
| Look for dependencies in PATH. | ||
|
|
||
| Do not add Fink library and include paths. | ||
|
|
||
| Fix finding fribidi. | ||
|
|
||
| Do not remove duplicate flags when calling env.ParseConfig, as that turns the | ||
| "-arch x86_64 -arch i386" we pass when building universal into | ||
| "x86_64 -arch i386" resulting in "error: no such file or directory: 'x86_64'". | ||
|
|
||
| Exit after building the bundle, before building the dmg and rebuilding sources. | ||
| --- SConstruct.orig 2009-08-30 14:23:30.000000000 -0500 | ||
| +++ SConstruct 2018-10-18 00:39:21.000000000 -0500 | ||
| @@ -14,6 +14,9 @@ | ||
|
|
||
| def establish_options(env): | ||
| opts = Options('options_cache.py') | ||
| + opts.Add("CC", "Manually set the C compiler", "cc") | ||
| + opts.Add("CXX", "Manually set the C++ compiler", "c++") | ||
| + opts.Add("CFLAGS", "Manually add to the CFLAGS", "-g") | ||
| opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g") | ||
| opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g") | ||
| if isDarwinPlatform: | ||
| @@ -120,13 +123,23 @@ | ||
| missing.append("libboost_thread") | ||
| env.Append(LIBS=[boost_thread]) | ||
|
|
||
| + boost_system = '' | ||
| + if conf.CheckLib("boost_system"): | ||
| + boost_system="boost_system" | ||
| + elif conf.CheckLib("boost_system-mt"): | ||
| + boost_system="boost_system-mt" | ||
| + else: | ||
| + print "Could not find libboost_system or libboost_system-mt" | ||
| + missing.append("libboost_system") | ||
| + env.Append(LIBS=[boost_system]) | ||
| + | ||
| boost_date_time = '' | ||
| if conf.CheckLib("boost_date_time") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"): | ||
| - boost_thread="boost_thread" | ||
| + boost_date_time="boost_date_time" | ||
| elif conf.CheckLib("boost_date_time-mt") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"): | ||
| - boost_thread="boost_thread-mt" | ||
| + boost_date_time="boost_date_time-mt" | ||
| else: | ||
| - print "Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp" | ||
| + print "Could not find libboost_date_time or libboost_date_time-mt or boost/date_time/posix_time/posix_time.hpp" | ||
| missing.append("libboost_date_time") | ||
| env.Append(LIBS=[boost_date_time]) | ||
|
|
||
| @@ -225,7 +238,7 @@ | ||
| action='store', | ||
| metavar='portaudio', | ||
| help='should portaudio be used') | ||
| - env = Environment() | ||
| + env = Environment(ENV = {'PATH' : os.environ['PATH']}) | ||
| try: | ||
| env.Clone() | ||
| except AttributeError: | ||
| @@ -241,11 +254,10 @@ | ||
| if env['mingw'] or isWindowsPlatform: | ||
| env.Append(LIBPATH=["C:/msys/1.0/local/lib", "C:/msys/1.0/lib"]) | ||
| 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"]) | ||
| - if isDarwinPlatform: | ||
| - env.Append(LIBPATH=["/sw/lib"]) | ||
| - env.Append(CPPPATH=["/sw/include"]) | ||
| - configure(env) | ||
| env.Append(CPPPATH=['#libgag/include', '#']) | ||
| + env.ParseConfig("pkg-config fribidi --cflags", None, False) | ||
| + env.ParseConfig("pkg-config fribidi --libs", None, False) | ||
| + configure(env) | ||
| if env['release']: | ||
| env.Append(CXXFLAGS=' -O2') | ||
| env.Append(LINKFLAGS=' -O2') | ||
| @@ -261,8 +273,8 @@ | ||
| env.Append(CPPPATH=['/usr/local/include/SDL']) | ||
| env.Append(CPPDEFINES=['-D_GNU_SOURCE=1', '-Dmain=SDL_main']) | ||
| else: | ||
| - env.ParseConfig("sdl-config --cflags") | ||
| - env.ParseConfig("sdl-config --libs") | ||
| + env.ParseConfig("sdl-config --cflags", None, False) | ||
| + env.ParseConfig("sdl-config --libs", None, False) | ||
| env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex']) | ||
|
|
||
| env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz" | ||
| @@ -296,6 +307,7 @@ | ||
| BUNDLE_PLIST="darwin/Info.plist", | ||
| BUNDLE_ICON="darwin/Glob2.icns" ) | ||
| bundle.createBundle(os.getcwd(), os.getcwd(), env) | ||
| + Exit(0) | ||
| dmg.create_dmg("Glob2-%s"%env["VERSION"],"%s.app"%env["BUNDLE_NAME"],env) | ||
|
|
||
| #TODO mac_bundle should be dependency of Dmg: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| Do not copy libraries into app bundle. | ||
| --- scons/bundle.py.orig 2009-06-14 05:11:34.000000000 -0500 | ||
| +++ scons/bundle.py 2018-10-18 00:26:09.000000000 -0500 | ||
| @@ -30,8 +30,6 @@ | ||
| # add icon -- TODO generate .icns file from png or svg | ||
| iconFile = env['BUNDLE_ICON'] | ||
| run('cp %s %s/Contents/Resources' % (iconFile, bundleDir) ) | ||
| - # add dependent libraries, fixing all absolute paths | ||
| - addDependentLibsToBundle( bundleDir ) | ||
|
|
||
|
|
||
| def createBundleMessage(target, source, env) : |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| The code uses iostream, not stdio.h. Failing to include iostream | ||
| causes "error: no member named 'cout' in namespace 'std'". | ||
| --- src/VoiceRecorder.cpp.orig 2009-08-29 15:39:06.000000000 -0500 | ||
| +++ src/VoiceRecorder.cpp 2018-10-17 21:46:33.000000000 -0500 | ||
| @@ -21,7 +21,7 @@ | ||
|
|
||
| #include "VoiceRecorder.h" | ||
| #include <assert.h> | ||
| -#include <stdio.h> | ||
| +#include <iostream> | ||
| #include "Order.h" | ||
| #include "Utilities.h" | ||
|
|
This file was deleted.
Oops, something went wrong.