[openjk] 126/130: d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch: alter to define SOURCE_DATE in q_platform.h as requested upstream
Simon McVittie
smcv at debian.org
Fri Oct 28 11:09:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit 41d946a8a04cc1b2355d790cf1eb520072abb2a0
Author: Simon McVittie <smcv at debian.org>
Date: Fri Oct 28 11:10:20 2016 +0100
d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch: alter to define SOURCE_DATE in q_platform.h as requested upstream
---
debian/changelog | 2 +
...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 74 ++++++++--------------
2 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fcfd325..f184d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ openjk (0~20161025+dfsg1-1) UNRELEASED; urgency=medium
d/p/Declare-platform-independent-byteswapping-functions-QINLI.patch,
d/p/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch:
drop, applied upstream
+ * d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch:
+ alter to define SOURCE_DATE in q_platform.h as requested upstream
-- Simon McVittie <smcv at debian.org> Fri, 28 Oct 2016 10:57:57 +0100
diff --git a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index 6dcb238..d79aec0 100644
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -1,5 +1,5 @@
From: Simon McVittie <smcv at debian.org>
-Date: Sun, 20 Mar 2016 16:27:52 +0000
+Date: Fri, 28 Oct 2016 11:09:16 +0100
Subject: Pick up date from SOURCE_DATE_EPOCH, for reproducible builds
The goal of reproducible builds is that a rebuild of the same source
@@ -19,22 +19,21 @@ Similar to <https://github.com/ioquake/ioq3/pull/225>.
Forwarded: https://github.com/JACoders/OpenJK/pull/874
---
- CMakeLists.txt | 9 +++++++++
- code/game/g_main.cpp | 4 ++--
- code/qcommon/common.cpp | 4 ++--
- code/qcommon/q_shared.h | 4 ++++
- codeJK2/game/g_main.cpp | 4 ++--
- codemp/game/g_main.c | 2 +-
- codemp/game/g_xcvar.h | 2 +-
- codemp/qcommon/common.cpp | 4 ++--
- codemp/qcommon/q_shared.h | 4 ++++
- 9 files changed, 27 insertions(+), 10 deletions(-)
+ CMakeLists.txt | 9 +++++++++
+ code/game/g_main.cpp | 4 ++--
+ code/qcommon/common.cpp | 4 ++--
+ codeJK2/game/g_main.cpp | 4 ++--
+ codemp/game/g_main.c | 2 +-
+ codemp/game/g_xcvar.h | 2 +-
+ codemp/qcommon/common.cpp | 4 ++--
+ shared/qcommon/q_platform.h | 5 +++++
+ 8 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d6130ba..a6c03bf 100644
+index 7a17d4d..e393e4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -301,6 +301,15 @@ if(BuildPortableVersion)
+@@ -302,6 +302,15 @@ if(BuildPortableVersion)
set(SharedDefines ${SharedDefines} "_PORTABLE_VERSION")
endif()
@@ -51,10 +50,10 @@ index d6130ba..a6c03bf 100644
diff --git a/code/game/g_main.cpp b/code/game/g_main.cpp
-index edc43e8..384c26a 100644
+index 8ae2c6d..6b385af 100644
--- a/code/game/g_main.cpp
+++ b/code/game/g_main.cpp
-@@ -604,7 +604,7 @@ void G_InitCvars( void ) {
+@@ -617,7 +617,7 @@ void G_InitCvars( void ) {
// noset vars
gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM );
@@ -63,7 +62,7 @@ index edc43e8..384c26a 100644
g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM);
// latched vars
-@@ -721,7 +721,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons
+@@ -734,7 +734,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons
gi.Printf ("------- Game Initialization -------\n");
gi.Printf ("gamename: %s\n", GAMEVERSION);
@@ -94,26 +93,11 @@ index a1e73e4..031e2b3 100644
com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
#ifdef JK2_MODE
-diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
-index 69f13ae..a0ed458 100644
---- a/code/qcommon/q_shared.h
-+++ b/code/qcommon/q_shared.h
-@@ -80,6 +80,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
- #define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN
- #endif
-
-+#ifndef SOURCE_DATE
-+#define SOURCE_DATE __DATE__
-+#endif
-+
- #define BASEGAME "base"
- #define OPENJKGAME "OpenJK"
-
diff --git a/codeJK2/game/g_main.cpp b/codeJK2/game/g_main.cpp
-index 47edd14..6738e61 100644
+index ef78173..3dba32d 100644
--- a/codeJK2/game/g_main.cpp
+++ b/codeJK2/game/g_main.cpp
-@@ -546,7 +546,7 @@ void G_InitCvars( void ) {
+@@ -558,7 +558,7 @@ void G_InitCvars( void ) {
// noset vars
gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM );
@@ -122,7 +106,7 @@ index 47edd14..6738e61 100644
g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM);
// latched vars
-@@ -608,7 +608,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons
+@@ -620,7 +620,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons
gi.Printf ("------- Game Initialization -------\n");
gi.Printf ("gamename: %s\n", GAMEVERSION);
@@ -179,18 +163,16 @@ index 525e3d4..3011c8d 100644
com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
SE_Init();
-diff --git a/codemp/qcommon/q_shared.h b/codemp/qcommon/q_shared.h
-index d845bc8..7422c48 100644
---- a/codemp/qcommon/q_shared.h
-+++ b/codemp/qcommon/q_shared.h
-@@ -29,6 +29,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
-
- #define PRODUCT_NAME "openjk"
-
+diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h
+index 0d60290..9e1067a 100644
+--- a/shared/qcommon/q_platform.h
++++ b/shared/qcommon/q_platform.h
+@@ -362,3 +362,8 @@ typedef union byteAlias_u {
+ #else
+ #define PLATFORM_STRING OS_STRING "-" ARCH_STRING "-debug"
+ #endif
++
++// to support https://reproducible-builds.org/specs/source-date-epoch/
+#ifndef SOURCE_DATE
+#define SOURCE_DATE __DATE__
+#endif
-+
- #define CLIENT_WINDOW_TITLE "OpenJK (MP)"
- #define CLIENT_CONSOLE_TITLE "OpenJK Console (MP)"
- #define HOMEPATH_NAME_UNIX "openjk"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list