<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a45822f5cc07a1bf2c1aec4dbfc0b5634403b29">https://github.com/macports/macports-ports/commit/9a45822f5cc07a1bf2c1aec4dbfc0b5634403b29</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 9a45822f5cc scummvm/scummvm-devel: update to current
</span>9a45822f5cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a45822f5cc07a1bf2c1aec4dbfc0b5634403b29
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Nov 9 08:50:12 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> scummvm/scummvm-devel: update to current
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - scummvm updates to 2.7.1
</span><span style='display:block; white-space:pre;color:#404040;'> - scummvm-devel to current commit
</span><span style='display:block; white-space:pre;color:#404040;'> - a few patches have been incorporated upstream,sometimes in
</span><span style='display:block; white-space:pre;color:#404040;'> slightly different formats to similar effect.
</span><span style='display:block; white-space:pre;color:#404040;'> - one plugin fails to link libfreetype unless manually added
</span>---
emulators/scummvm/Portfile | 72 ++++++----------------
.../files/patch-scummvm-macosx-versions.diff | 34 ----------
.../scummvm/files/patch-scummvm-macosx-window.diff | 13 ----
...et.diff => patch-scummvm-sdl2net-includes.diff} | 10 +--
.../files/remove-date-time-from-version.patch | 62 ++++++++++---------
5 files changed, 57 insertions(+), 134 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/Portfile b/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff8ff041ef9..382f81c619b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +16,11 @@ long_description \
</span> homepage https://www.scummvm.org
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup scummvm scummvm 2.5.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums sha256 b47ee4b195828d2c358e38a4088eda49886dc37a04f1cc17b981345a59e0d623 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a4fa5b99f483d27e7c132fd5c553aa88030c627e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 130095472
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup scummvm scummvm 2.7.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha256 d6bbf62e33154759a609d59f3034d71652ecdb64ed5c800156718ab1f1d5d063 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 555f440a2d8106eb40d63d504c9cc7beb2643386 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 148127416
</span>
conflicts ${name}-devel
long_description ${description}: \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,29 +31,26 @@ if {${subport} eq ${name}} {
</span> master_sites https://downloads.scummvm.org/frs/${name}/${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-scummvm-macosx-window.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-scummvm-macosx-versions.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-scummvm-sdl2net-includes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove-date-time-from-version.patch
</span>
github.livecheck.regex {([0-9.]+)}
}
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup scummvm scummvm b8132baa943f3a9c82886ea074a34140aa2557f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20211011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ff96dad1308e4184a4965eeaec35cd592bc65aa6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96cd2135dcdb0ffe4de802181f14faa821f5868ce1c0bff4e869f1488a18e9de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 151853236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup scummvm scummvm d52e078a82bbe0a569669b3f94a853ecc7776992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20231109
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 714933a6171cc1e1d9284b06a91815994e41fd5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0e28234caf26c25b076449e36f647d045eac4ae0dd573a39ea03dd455ddc2d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 241152219
</span>
conflicts ${name}
long_description ${description}: \
This port follows the master version of ${name}, which is typically updated every few weeks.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-scummvm-macosx-window.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-scummvm-sdl2net-includes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove-date-time-from-version.patch
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,8 +93,7 @@ configure.args-append \
</span> --enable-jpeg \
--enable-readline \
--enable-all-engines \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-verbose-build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-verbose-build
</span>
# libcurl needs --enable-cloud as well otherwise link errors
# also connected to --enable-sdlnet
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,8 +102,8 @@ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} ne ""} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the plugins fail to link against libSDL2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lSDL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# some plugins fail to link unless these are manually added
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -lSDL2 -lfreetype
</span>
# Fix build on G3
platform powerpc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,35 +115,3 @@ platform powerpc {
</span>
# Leopard build, at least, fails without c++11
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mpeg2 description {add mpeg2 support - has many dependencies} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this builds fine, but libmpeg2 is old (2008) and pulls in a lot of deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and I'm not sure if any games actually use this - make it optional
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-mpeg2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmpeg2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python2_select \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python_select \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xorgproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXau \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXdmcp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libpthread-stubs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xcb-proto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/patch-scummvm-macosx-versions.diff b/emulators/scummvm/files/patch-scummvm-macosx-versions.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9529be30191..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/files/patch-scummvm-macosx-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/scummvm/scummvm/pull/3414
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- backends/platform/sdl/macosx/macosx-compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ backends/platform/sdl/macosx/macosx-compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MAC_OS_X_VERSION_10_6 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define MAC_OS_X_VERSION_10_7 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef MAC_OS_X_VERSION_10_10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MAC_OS_X_VERSION_10_10 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- backends/platform/sdl/macosx/macosx-window.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ backends/platform/sdl/macosx/macosx-window.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FORBIDDEN_SYMBOL_ALLOW_ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "backends/platform/sdl/macosx/macosx-window.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "backends/platform/sdl/macosx/macosx-compat.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AppKit/NSWindow.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float SdlWindow_MacOSX::getDpiScalingFactor() const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_SysWMinfo wmInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (getSDLWMInformation(&wmInfo)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindow *nswindow = wmInfo.info.cocoa.window;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (nswindow)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([nswindow respondsToSelector:@selector(backingScaleFactor)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [nswindow backingScaleFactor];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/patch-scummvm-macosx-window.diff b/emulators/scummvm/files/patch-scummvm-macosx-window.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21bde5a255c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/files/patch-scummvm-macosx-window.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The YES and NO Objective-C macros clash with enum values of the same name in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DisposeAfterUse class.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- backends/platform/sdl/macosx/macosx-window.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ backends/platform/sdl/macosx/macosx-window.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MACOSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "common/ptr.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "backends/platform/sdl/sdl-window.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class SdlWindow_MacOSX final : public SdlWindow {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/patch-scummvm-sdl2indet.diff b/emulators/scummvm/files/patch-scummvm-sdl2net-includes.diff
</span>similarity index 53%
rename from emulators/scummvm/files/patch-scummvm-sdl2indet.diff
rename to emulators/scummvm/files/patch-scummvm-sdl2net-includes.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5f31a4c2a0a..a7252136873 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/files/patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/patch-scummvm-sdl2net-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-10-04 16:41:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-11-07 15:30:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1377,7 +1377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5c28f7e3..dd877d57 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1343,7 +1343,7 @@ for ac_option in $@; do
</span> ;;
--with-sdlnet-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,4 +10,4 @@
</span> + SDL_NET_CFLAGS="-I$arg/include/SDL2"
SDL_NET_LIBS="-L$arg/lib"
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-iconv-prefix=*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-opengl-prefix=*)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/remove-date-time-from-version.patch b/emulators/scummvm/files/remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 08ff5bfb23c..e8b195e343a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/scummvm/files/remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +1,48 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove build date and time from version strings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.scummvm.org/ticket/11246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://reproducible-builds.org/docs/version-information/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff --git base/version.cpp base/version.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c19cd0c..e73c340 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 70ca120a..0a2178ea 100644
</span> --- base/version.cpp
+++ base/version.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,9 +59,8 @@ const char *gScummVMVersion = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,8 +58,7 @@ const char gScummVMVersion[] = SCUMMVM_VERSION SCUMMVM_REVISION;
</span> #if defined(__amigaos4__) || defined(__MORPHOS__)
static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMBuildDate = __DATE__ " " __TIME__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const char *gScummVMVersionDate = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *gScummVMFeatures = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char gScummVMBuildDate[] = __DATE__ " " __TIME__;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++const char gScummVMVersionDate[] = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char gScummVMCompiler[] = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STR_HELPER(x) #x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STR(x) STR_HELPER(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +76,7 @@ const char gScummVMCompiler[] = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef STR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef STR_HELPER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char gScummVMFeatures[] = ""
</span> #ifdef TAINTED_BUILD
// TAINTED means the build contains engines/subengines not enabled by default
diff --git base/version.h base/version.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 74a0e72..cbd731d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 657a703f..2fd08537 100644
</span> --- base/version.h
+++ base/version.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,6 @@
</span> #define BASE_VERSION_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMVersion; // e.g. "0.4.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern const char *gScummVMBuildDate; // e.g. "2003-06-24"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./gui/about.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./gui/about.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,9 +99,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version += gScummVMVersion;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lines.push_back(version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char gScummVMVersion[]; // e.g. "0.4.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern const char gScummVMBuildDate[]; // e.g. "2003-06-24"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char gScummVMVersionDate[]; // e.g. "0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char gScummVMCompiler[]; // e.g. "GCC 11.2.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char gScummVMFullVersion[]; // e.g. "ScummVM 0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gui/about.cpp gui/about.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0af3e31c..d4ed4614 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gui/about.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gui/about.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,7 @@ AboutDialog::AboutDialog()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addLine(version);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- Common::U32String date = Common::U32String::format(_("(built on %s)"), gScummVMBuildDate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _lines.push_back(U32String("C2") + date);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < ARRAYSIZE(copyright_text); i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addLine(U32String(copyright_text[i]));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I18N: built on <build date> with <compiler>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Common::U32String date = Common::U32String::format(_("(built on %s with %s)"), gScummVMBuildDate, gScummVMCompiler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Common::U32String date = Common::U32String::format(_("(built with %s)"), gScummVMCompiler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addLine(Common::U32String("C2") + date);
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < ARRAYSIZE(copyright_text); i++)
</span></pre><pre style='margin:0'>
</pre>