<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/1ada29de021cad5b6e46a7a66baed8b7b5d8aef8">https://github.com/macports/macports-ports/commit/1ada29de021cad5b6e46a7a66baed8b7b5d8aef8</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 1ada29de021 scummvm-devel: bump to 20201209
</span>1ada29de021 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1ada29de021cad5b6e46a7a66baed8b7b5d8aef8
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Dec 10 00:18:22 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> scummvm-devel: bump to 20201209
</span>---
emulators/scummvm/Portfile | 25 +++++++-----
.../remove-date-time-from-version-devel.patch | 44 ++++++++++++++++++++++
2 files changed, 60 insertions(+), 9 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 ad1ae0a2394..b5e91efacdb 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;'>@@ -30,27 +30,34 @@ 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:#e0ffe0;'>+ patchfiles-append patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.livecheck.regex {([0-9.]+)}
}
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup scummvm scummvm ccab85ffb2c735f65ddf8c688730b6d211c073f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191107
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 350934b943ae350553b0cd80fd1e19ba9d9d1733 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 80ae31e59c9b32f0881b535c20c6166be441de2f55319d8909a6aa5f700bd0d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38357552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup scummvm scummvm 62581d91cdc4f18ef22aeae8778c96e1e0c63dca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20201209
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c26b3eb067e299ef15f10e88deb8027d8d6e5821 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f40e642d50fde808a7f8102ed957a7b832047e1b762d87b737ac840dc738b097 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 140636255
</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:#e0ffe0;'>+ patchfiles-append patch-scummvm-sdl2indet.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append remove-date-time-from-version-devel.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this needs to be added to the devel build at present, otherwise all the plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fail to link against libSDL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -lSDL2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
}
<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 remove-date-time-from-version.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:libsdl2 \
port:libsdl2_net \
port:libmad \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/scummvm/files/remove-date-time-from-version-devel.patch b/emulators/scummvm/files/remove-date-time-from-version-devel.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..08ff5bfb23c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/scummvm/files/remove-date-time-from-version-devel.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove build date and time from version strings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.scummvm.org/ticket/11246
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://reproducible-builds.org/docs/version-information/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git base/version.cpp base/version.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c19cd0c..e73c340 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- base/version.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ base/version.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,9 +59,8 @@ const char *gScummVMVersion = SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__amigaos4__) || defined(__MORPHOS__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char *version_cookie __attribute__((used)) = "$VER: ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" AMIGA_DATE ")";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</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 *gScummVMFullVersion = "ScummVM " 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 *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *gScummVMFeatures = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TAINTED_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // TAINTED means the build contains engines/subengines not enabled by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git base/version.h base/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 74a0e72..cbd731d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- base/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ base/version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BASE_VERSION_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 *gScummVMFullVersion; // e.g. "ScummVM 0.4.1 (2003-06-24)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char *gScummVMFeatures; // e.g. "ALSA MPEG2 zLib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./gui/about.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./gui/about.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,9 +99,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version += gScummVMVersion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lines.push_back(version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Common::U32String date = Common::U32String::format(_("(built on %s)"), gScummVMBuildDate);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lines.push_back(U32String("C2") + date);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < ARRAYSIZE(copyright_text); i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addLine(U32String(copyright_text[i]));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>