OBS-URL: https://build.opensuse.org/package/show/games/doomsday?expand=0&rev=57
263 lines
14 KiB
Diff
263 lines
14 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2017-12-14 16:39:34.541146300 +0100
|
|
|
|
Burn __DATE__ and __TIME__, this changes all the time.
|
|
|
|
---
|
|
doomsday/apps/client/include/dd_def.h | 2 +-
|
|
doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp | 3 +--
|
|
doomsday/apps/plugins/directsound/include/version.h | 2 +-
|
|
doomsday/apps/plugins/doom/include/version.h | 2 +-
|
|
doomsday/apps/plugins/doom64/include/version.h | 2 +-
|
|
doomsday/apps/plugins/example/include/version.h | 2 +-
|
|
doomsday/apps/plugins/fluidsynth/include/version.h | 2 +-
|
|
doomsday/apps/plugins/fmod/include/version.h | 2 +-
|
|
doomsday/apps/plugins/heretic/include/version.h | 2 +-
|
|
doomsday/apps/plugins/hexen/include/version.h | 2 +-
|
|
doomsday/apps/plugins/importdeh/include/version.h | 2 +-
|
|
doomsday/apps/plugins/importidtech1/include/version.h | 2 +-
|
|
doomsday/apps/plugins/importsave/include/version.h | 2 +-
|
|
doomsday/apps/plugins/importudmf/include/version.h | 2 +-
|
|
doomsday/apps/plugins/openal/include/version.h | 2 +-
|
|
doomsday/apps/plugins/winmm/include/version.h | 2 +-
|
|
doomsday/tools/amethyst/src/defs.h | 2 +-
|
|
doomsday/tools/savegametool/src/main.cpp | 3 +--
|
|
18 files changed, 18 insertions(+), 20 deletions(-)
|
|
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/client/include/dd_def.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/client/include/dd_def.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/client/include/dd_def.h
|
|
@@ -78,7 +78,7 @@ extern "C" {
|
|
|
|
#define DOOMSDAY_VER_ID DOOMSDAY_RELEASE_TYPE DOOMSDAY_VER_ID_64BIT DOOMSDAY_VER_ID_DEBUG DOOMSDAY_VER_ID_RANGECHECK DOOMSDAY_VER_ID_BUILD
|
|
|
|
-#define DOOMSDAY_VERSION_FULLTEXT DOOMSDAY_VERSION_TEXT " (" DOOMSDAY_VER_ID ") " __DATE__ " " __TIME__
|
|
+#define DOOMSDAY_VERSION_FULLTEXT DOOMSDAY_VERSION_TEXT " (" DOOMSDAY_VER_ID ")"
|
|
|
|
#define SAFEDIV(x,y) (!(y) || !((x)/(y))? 1 : (x)/(y))
|
|
#define ORDER(x,y,a,b) ( (x)<(y)? ((a)=(x),(b)=(y)) : ((b)=(x),(a)=(y)) )
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/client/src/ui/dialogs/aboutdialog.cpp
|
|
@@ -84,8 +84,7 @@ AboutDialog::AboutDialog() : DialogWidge
|
|
.arg(DOOMSDAY_RELEASE_TYPE)
|
|
//.arg(version.compactNumber())
|
|
.arg(version.build)
|
|
- .arg(Time::fromText(__DATE__ " " __TIME__, Time::CompilerDateTime)
|
|
- .asDateTime().toString(Qt::SystemLocaleShortDate))
|
|
+ .arg("")
|
|
.arg(tr("bit"))
|
|
.arg(version.gitDescription.isEmpty()? "" : ("\n" _E(s)_E(F) + version.gitDescription + _E(.)_E(.)));
|
|
info->setText(txt);
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/directsound/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/directsound/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/directsound/include/version.h
|
|
@@ -46,7 +46,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for audio playback via DirectSound"
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.2.5"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSDIRECTSOUND_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSDIRECTSOUND_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,2,5,0 // For WIN32 version info.
|
|
|
|
#endif
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/doom/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/doom/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/doom/include/version.h
|
|
@@ -59,7 +59,7 @@
|
|
#define PLUGIN_DOCSURL DOOMSDAY_DOCSURL
|
|
|
|
#define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JDOOM_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JDOOM_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info.
|
|
|
|
// For WIN32 version info:
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/doom64/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/doom64/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/doom64/include/version.h
|
|
@@ -58,7 +58,7 @@
|
|
#define PLUGIN_DOCSURL DOOMSDAY_DOCSURL
|
|
|
|
#define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JDOOM64_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JDOOM64_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info.
|
|
|
|
// For WIN32 version info:
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/example/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/example/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/example/include/version.h
|
|
@@ -44,7 +44,7 @@
|
|
#define PLUGIN_DOCSURL DOOMSDAY_DOCSURL
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.2.0"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version" PLUGIN_VERSION_TEXT " " __DATE__ " (" EXAMPLE_PLUGIN_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version" PLUGIN_VERSION_TEXT " (" EXAMPLE_PLUGIN_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,2,0,0 // For WIN32 version info.
|
|
|
|
// For WIN32 version info:
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/fluidsynth/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/fluidsynth/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/fluidsynth/include/version.h
|
|
@@ -38,7 +38,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for music playback via FluidSynth"
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.1.0"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSFLUIDSYNTH_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSFLUIDSYNTH_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,1,0,0 // For WIN32 version info.
|
|
|
|
#endif
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/fmod/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/fmod/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/fmod/include/version.h
|
|
@@ -58,7 +58,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for audio playback via Firelight Technologies' FMOD Ex "
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.0.2"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSFMOD_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSFMOD_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,0,2,0 // For WIN32 version info.
|
|
|
|
#endif
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/heretic/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/heretic/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/heretic/include/version.h
|
|
@@ -59,7 +59,7 @@
|
|
#define PLUGIN_DOCSURL DOOMSDAY_DOCSURL
|
|
|
|
#define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JHERETIC_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JHERETIC_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info.
|
|
|
|
// For WIN32 version info:
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/hexen/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/hexen/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/hexen/include/version.h
|
|
@@ -59,7 +59,7 @@
|
|
#define PLUGIN_DOCSURL DOOMSDAY_DOCSURL
|
|
|
|
#define PLUGIN_VERSION_TEXT DOOMSDAY_VERSION_BASE
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" JHEXEN_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" JHEXEN_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER DOOMSDAY_VERSION_NUMBER // For WIN32 version info.
|
|
|
|
// For WIN32 version info:
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/importdeh/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/importdeh/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/importdeh/include/version.h
|
|
@@ -39,7 +39,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for importing DeHackEd patches."
|
|
|
|
#define PLUGIN_VERSION_TEXT "2.0.0"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DEHREAD_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DEHREAD_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 2,0,0,0 // For WIN32 version info.
|
|
|
|
#endif // LIBDEHREAD_VERSION_H
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/importidtech1/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/importidtech1/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/importidtech1/include/version.h
|
|
@@ -40,7 +40,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for loading id Tech 1 resources."
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.0.0"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" IMPORTIDTECH1_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" IMPORTIDTECH1_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,0,0,0 // For WIN32 version info.
|
|
|
|
#endif // IMPORTIDTECH1_VERSION_H
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/importsave/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/importsave/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/importsave/include/version.h
|
|
@@ -38,7 +38,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for importing legacy saved games."
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.0.0"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" IMPORTSAVE_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" IMPORTSAVE_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,0,0,0 // For WIN32 version info.
|
|
|
|
#endif // IMPORTSAVE_VERSION_H
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/importudmf/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/importudmf/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/importudmf/include/version.h
|
|
@@ -38,7 +38,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for importing Universal Doom Map Format maps."
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.0.0"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" IMPORTUDMF_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" IMPORTUDMF_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,0,0,0 // For WIN32 version info.
|
|
|
|
#endif // IMPORTUDMF_VERSION_H
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/openal/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/openal/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/openal/include/version.h
|
|
@@ -46,7 +46,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for audio playback via OpenAL"
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.2.4"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSOPENAL_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSOPENAL_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,2,4,0 // For WIN32 version info.
|
|
|
|
#endif
|
|
Index: Doomsday-Engine-2.1.1/doomsday/apps/plugins/winmm/include/version.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/apps/plugins/winmm/include/version.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/apps/plugins/winmm/include/version.h
|
|
@@ -46,7 +46,7 @@
|
|
#define PLUGIN_DETAILS "Doomsday plugin for audio playback via Windows Multimedia."
|
|
|
|
#define PLUGIN_VERSION_TEXT "1.0.5"
|
|
-#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " " __DATE__ " (" DSWINMM_VER_ID ")"
|
|
+#define PLUGIN_VERSION_TEXTLONG "Version " PLUGIN_VERSION_TEXT " (" DSWINMM_VER_ID ")"
|
|
#define PLUGIN_VERSION_NUMBER 1,0,5,0 // For WIN32 version info.
|
|
|
|
#endif
|
|
Index: Doomsday-Engine-2.1.1/doomsday/tools/amethyst/src/defs.h
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/tools/amethyst/src/defs.h
|
|
+++ Doomsday-Engine-2.1.1/doomsday/tools/amethyst/src/defs.h
|
|
@@ -19,7 +19,7 @@
|
|
#define __AMETHYST_COMMON_DEFS_H__
|
|
|
|
#define VERSION_STR "1.1.2"
|
|
-#define BUILD_STR "Version " VERSION_STR " (" __DATE__ ")"
|
|
+#define BUILD_STR "Version " VERSION_STR " ()"
|
|
#define MAX_COLUMNS 40
|
|
|
|
#define IS_BREAK(c) ((c)=='@' || (c)=='{' || (c)=='}' || (c)=='$')
|
|
Index: Doomsday-Engine-2.1.1/doomsday/tools/savegametool/src/main.cpp
|
|
===================================================================
|
|
--- Doomsday-Engine-2.1.1.orig/doomsday/tools/savegametool/src/main.cpp
|
|
+++ Doomsday-Engine-2.1.1/doomsday/tools/savegametool/src/main.cpp
|
|
@@ -72,8 +72,7 @@ String versionText()
|
|
return String("%1 version %2 (%3)")
|
|
.arg(DENG2_TEXT_APP->applicationName())
|
|
.arg(DENG2_TEXT_APP->applicationVersion())
|
|
- .arg(Time::fromText(__DATE__ " " __TIME__, Time::CompilerDateTime)
|
|
- .asDateTime().toString(Qt::SystemLocaleShortDate));
|
|
+ .arg("");
|
|
}
|
|
|
|
Path composeMapUriPath(duint32 episode, duint32 map)
|