-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
73 additions
and
77 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 |
|---|---|---|
| @@ -1,55 +1,54 @@ | ||
| --- a/SConstruct 2017-10-05 22:51:46.000000000 -0500 | ||
| +++ b/SConstruct 2017-10-05 22:52:32.000000000 -0500 | ||
| @@ -190,20 +190,20 @@ | ||
| diff -ruN boswars-2.8-src-orig/make.py boswars-2.8-src/make.py | ||
| --- boswars-2.8-src-orig/make.py 2023-06-26 14:31:19.000000000 -0500 | ||
| +++ boswars-2.8-src/make.py 2023-10-01 17:29:57.000000000 -0500 | ||
| @@ -289,6 +289,7 @@ | ||
| libs = 'GL opengl3 opengl32'.split() | ||
| if sys.platform == 'darwin': | ||
| b.incpath('/System/Library/Frameworks/OpenGL.framework/Libraries/') | ||
| + b.libpath('/System/Library/Frameworks/OpenGL.framework/Libraries/') | ||
| r = CheckLibAlternatives(b, libs) | ||
| if not r: | ||
| print('Did not find the OpenGL library, exiting !') | ||
| From 5cb645f8c55b536f0027314aac9216a200315708 Mon Sep 17 00:00:00 2001 | ||
| From: Francois Beerten <[email protected]> | ||
| Date: Wed, 5 Jul 2023 10:39:48 +0200 | ||
| Subject: [PATCH] fabricate.py: remove deprecated calls to | ||
| os.stat_float_times() | ||
|
|
||
| Since Python 2.5, stat times use floats and we require at least | ||
| Python 2.7. os.stat_float_times() is deprecated since Python | ||
| 3.1 and has been completely removed in Python 3.7. | ||
|
|
||
| References in Python doc and issue tracker: | ||
| * https://docs.python.org/3/whatsnew/changelog.html?highlight=stat_float_times#id409 | ||
| * https://bugs.python.org/issue31827 | ||
|
|
||
| This fixes one of the bugs detected by Luiz Gabriel Jung in bug #64375 | ||
| "Can't run new game version 2.8". | ||
| --- | ||
| fabricate.py | 5 ----- | ||
| 1 file changed, 5 deletions(-) | ||
|
|
||
| diff --git a/fabricate.py b/fabricate.py | ||
| index d63901d3..8fe46002 100644 | ||
| --- a/fabricate.py | ||
| +++ b/fabricate.py | ||
| @@ -378,10 +378,6 @@ class AtimesRunner(Runner): | ||
| """ Run command and return its dependencies and outputs, using before | ||
| and after access times to determine dependencies. """ | ||
|
|
||
| ## check for required libs ## | ||
| if not conf.CheckLibWithHeader('png', 'png.h', 'c'): | ||
| - print 'Did not find png library or headers, exiting!' | ||
| + print('Did not find png library or headers, exiting!') | ||
| Exit(1) | ||
| if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'): | ||
| - print 'Did not find the zlib library or headers, exiting!' | ||
| + print('Did not find the zlib library or headers, exiting!') | ||
| Exit(1) | ||
| if not 'USE_WIN32' in env['CPPDEFINES'] and not sys.platform.startswith('freebsd'): | ||
| if not conf.CheckLib('dl'): | ||
| - print 'Did not find dl library or header which is needed on some systems for lua. Exiting!' | ||
| + print('Did not find dl library or header which is needed on some systems for lua. Exiting!') | ||
| Exit(1) | ||
| if not CheckLuaLib(env, conf): | ||
| - print 'Did not find required lua library. Exiting!' | ||
| + print('Did not find required lua library. Exiting!') | ||
| Exit(1) | ||
| if not CheckOpenGL(env, conf): | ||
| - print 'Did not find required OpenGL library. Exiting!' | ||
| + print('Did not find required OpenGL library. Exiting!') | ||
| Exit(1) | ||
| - # For Python pre-2.5, ensure os.stat() returns float atimes | ||
| - old_stat_float = os.stat_float_times() | ||
| - os.stat_float_times(True) | ||
| - | ||
| originals = self.file_times() | ||
| if self.atimes == 2: | ||
| befores = originals | ||
| @@ -425,7 +421,6 @@ class AtimesRunner(Runner): | ||
| if original != afters.get(name, None): | ||
| self._utime(name, original[0], original[1]) | ||
|
|
||
| # Check for optional libraries # | ||
| @@ -232,7 +232,7 @@ | ||
| env.ParseConfig('sdl-config --libs') | ||
| if sys.platform != "darwin" and not '-Dmain=SDL_main' in env['CCFLAGS']: | ||
| if not conf.CheckLibWithHeader('SDL', 'SDL.h', 'c'): | ||
| - print 'Did not find SDL library or headers, exiting!' | ||
| + print('Did not find SDL library or headers, exiting!') | ||
| Exit(1) | ||
| - os.stat_float_times(old_stat_float) # restore stat_float_times value | ||
| return deps, outputs | ||
|
|
||
| env = conf.Finish() | ||
| @@ -245,14 +245,14 @@ | ||
| # Remove outdated cache file | ||
| os.remove(cachename) | ||
| if optionsChanged or not os.path.exists(cachename): | ||
| - print cachename + " doesn't exist or out of date." | ||
| - print "Generating new build config cache ..." | ||
| + print(cachename + " doesn't exist or out of date.") | ||
| + print("Generating new build config cache ...") | ||
| cache = DefineOptions(cachename, {}) | ||
| AutoConfigure(env) | ||
| cache.Save(cachename, env) | ||
| else: | ||
| cache = DefineOptions(cachename, {}) | ||
| - print "Using " + cachename | ||
| + print("Using " + cachename) | ||
| cache.Update(env) | ||
|
|
||
| AutoConfigureIfNeeded(env, '') | ||
| class StraceProcess(object): |