[iortcw] 04/08: Drop patches that were merged upstream
Simon McVittie
smcv at debian.org
Sun Nov 20 22:44:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository iortcw.
commit 43d4c461a5efd2b4e7b7e859c95525d6f5fdf7d0
Author: Simon McVittie <smcv at debian.org>
Date: Sun Nov 20 18:20:07 2016 +0000
Drop patches that were merged upstream
---
debian/changelog | 1 +
debian/patches/Fix-some-spelling-errors.patch | 329 ---------------------
...HLIBLDFLAGS-used-to-link-executables-only.patch | 91 ------
...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 202 -------------
debian/patches/series | 3 -
5 files changed, 1 insertion(+), 625 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d4aab5b..37e89ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ iortcw (1.50a+dfsg1-1) UNRELEASED; urgency=medium
* New upstream release 1.5a, represented as 1.50a here to make it
sort in the intended order
+ - drop patches that were merged upstream
- debian/copyright: update
-- Simon McVittie <smcv at debian.org> Sun, 20 Nov 2016 18:15:45 +0000
diff --git a/debian/patches/Fix-some-spelling-errors.patch b/debian/patches/Fix-some-spelling-errors.patch
deleted file mode 100644
index 6af7304..0000000
--- a/debian/patches/Fix-some-spelling-errors.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 21 Mar 2016 08:23:59 +0000
-Subject: Fix some spelling errors
-
-Detected by Debian's Lintian tool. It also detects "persistant", but
-unfortunately that misspelling is API (it's part of a cvar name
-and a commonly-used struct member) so it shouldn't be corrected.
-
-Applied-upstream: 1.42e, commit:https://github.com/iortcw/iortcw/commit/267ebc2974e6bfc48c2eed487cfd30b01705ddde
----
- MP/code/botlib/be_aas_cluster.c | 2 +-
- MP/code/game/ai_cast_characters.c | 2 +-
- MP/code/game/ai_cast_funcs.c | 2 +-
- MP/code/game/ai_cast_think.c | 2 +-
- MP/code/game/g_mover.c | 2 +-
- MP/code/game/g_team.c | 2 +-
- MP/code/game/g_tramcar.c | 2 +-
- MP/code/qcommon/cm_trace.c | 2 +-
- MP/code/qcommon/common.c | 2 +-
- MP/code/rend2/tr_animation.c | 2 +-
- MP/code/renderer/tr_animation.c | 2 +-
- SP/code/botlib/be_aas_cluster.c | 2 +-
- SP/code/game/ai_cast_characters.c | 2 +-
- SP/code/game/ai_cast_funcs.c | 4 ++--
- SP/code/game/ai_cast_think.c | 2 +-
- SP/code/game/g_mover.c | 2 +-
- SP/code/game/g_team.c | 2 +-
- SP/code/game/g_tramcar.c | 2 +-
- SP/code/qcommon/cm_trace.c | 2 +-
- SP/code/qcommon/common.c | 2 +-
- SP/code/rend2/tr_animation.c | 2 +-
- SP/code/renderer/tr_animation.c | 2 +-
- 22 files changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/MP/code/botlib/be_aas_cluster.c b/MP/code/botlib/be_aas_cluster.c
-index 3a3a481..5726ec7 100644
---- a/MP/code/botlib/be_aas_cluster.c
-+++ b/MP/code/botlib/be_aas_cluster.c
-@@ -152,7 +152,7 @@ int AAS_UpdatePortal( int areanum, int clusternum ) {
- } //end else if
- else
- {
-- Log_Write( "portal using area %d is seperating more than two clusters\r\n", areanum );
-+ Log_Write( "portal using area %d is separating more than two clusters\r\n", areanum );
- //remove the cluster portal flag contents
- ( *aasworld ).areasettings[areanum].contents &= ~AREACONTENTS_CLUSTERPORTAL;
- return qfalse;
-diff --git a/MP/code/game/ai_cast_characters.c b/MP/code/game/ai_cast_characters.c
-index a54734a..3104a55 100644
---- a/MP/code/game/ai_cast_characters.c
-+++ b/MP/code/game/ai_cast_characters.c
-@@ -1293,7 +1293,7 @@ void AIChar_Pain( gentity_t *ent, gentity_t *attacker, int damage, vec3_t point
- }
- }
-
-- // if we didnt just play a scripted sound, then play one of the default sounds
-+ // if we didn't just play a scripted sound, then play one of the default sounds
- if ( cs->lastScriptSound < level.time ) {
- G_AddEvent( ent, EV_GENERAL_SOUND, G_SoundIndex( aiDefaults[ent->aiCharacter].painSoundScript ) );
- }
-diff --git a/MP/code/game/ai_cast_funcs.c b/MP/code/game/ai_cast_funcs.c
-index b89adf5..bb666e3 100644
---- a/MP/code/game/ai_cast_funcs.c
-+++ b/MP/code/game/ai_cast_funcs.c
-@@ -872,7 +872,7 @@ char *AIFunc_InspectBulletImpact( cast_state_t *cs ) {
- cs->scriptPauseTime = 0;
- return AIFunc_IdleStart( cs );
- }
-- // make sure we didnt change thinkfunc
-+ // make sure we didn't change thinkfunc
- if ( cs->aifunc != AIFunc_InspectBulletImpact ) {
- //G_Error( "scripting passed control out of AIFunc_InspectBulletImpact(), this is bad" );
- return NULL;
-diff --git a/MP/code/game/ai_cast_think.c b/MP/code/game/ai_cast_think.c
-index e583f00..f4d6839 100644
---- a/MP/code/game/ai_cast_think.c
-+++ b/MP/code/game/ai_cast_think.c
-@@ -1053,7 +1053,7 @@ void AICast_PredictMovement( cast_state_t *cs, int numframes, float frametime, a
- //VectorCopy( thisHitVec, startHitVec );
- VectorCopy( pm.ps->origin, lastOrg );
- }
-- // if we didnt reach the marker, then check for something that blocked us
-+ // if we didn't reach the marker, then check for something that blocked us
- for ( i = 0; i < pm.numtouch; i++ ) {
- if ( pm.touchents[i] == pm.ps->groundEntityNum ) {
- continue;
-diff --git a/MP/code/game/g_mover.c b/MP/code/game/g_mover.c
-index d7f20ca..d6e39a6 100644
---- a/MP/code/game/g_mover.c
-+++ b/MP/code/game/g_mover.c
-@@ -390,7 +390,7 @@ qboolean G_TryPushingEntity( gentity_t *check, gentity_t *pusher, vec3_t move, v
- break;
- }
- }
-- // didnt work, so set the position back
-+ // didn't work, so set the position back
- VectorCopy( org, check->s.pos.trBase );
- if ( check->client ) {
- VectorCopy( org, check->client->ps.origin );
-diff --git a/MP/code/game/g_team.c b/MP/code/game/g_team.c
-index 4e098f1..8ffbafc 100644
---- a/MP/code/game/g_team.c
-+++ b/MP/code/game/g_team.c
-@@ -202,7 +202,7 @@ void Team_FragBonuses( gentity_t *targ, gentity_t *inflictor, gentity_t *attacke
-
- attacker->client->pers.teamState.carrierdefense++;
- team = attacker->client->sess.sessionTeam;
-- PrintMsg( NULL, "%s" S_COLOR_WHITE " defends %s's flag carrier against an agressive enemy\n",
-+ PrintMsg( NULL, "%s" S_COLOR_WHITE " defends %s's flag carrier against an aggressive enemy\n",
- attacker->client->pers.netname, TeamName( team ) );
- return;
- }
-diff --git a/MP/code/game/g_tramcar.c b/MP/code/game/g_tramcar.c
-index 2c378c0..0f3cece 100644
---- a/MP/code/game/g_tramcar.c
-+++ b/MP/code/game/g_tramcar.c
-@@ -293,7 +293,7 @@ void GetNextTrack( gentity_t *ent ) {
- }
-
- if ( !num_choices ) {
-- G_Printf( "GetNextTrack didnt find a track\n" );
-+ G_Printf( "GetNextTrack didn't find a track\n" );
- return;
- }
-
-diff --git a/MP/code/qcommon/cm_trace.c b/MP/code/qcommon/cm_trace.c
-index e694fb8..6e78ab7 100644
---- a/MP/code/qcommon/cm_trace.c
-+++ b/MP/code/qcommon/cm_trace.c
-@@ -1052,7 +1052,7 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t
- }
-
- //
-- // find the point distances to the seperating plane
-+ // find the point distances to the separating plane
- // and the offset for the size of the box
- //
- node = cm.nodes + num;
-diff --git a/MP/code/qcommon/common.c b/MP/code/qcommon/common.c
-index 81c51d2..d793299 100644
---- a/MP/code/qcommon/common.c
-+++ b/MP/code/qcommon/common.c
-@@ -419,7 +419,7 @@ void Com_ParseCommandLine( char *commandLine ) {
- com_numConsoleLines = 1;
-
- while ( *commandLine ) {
-- // look for a + seperating character
-+ // look for a + separating character
- // if commandLine came from a file, we might have real line seperators
- if ( *commandLine == '+' || *commandLine == '\n' ) {
- if ( com_numConsoleLines == MAX_CONSOLE_LINES ) {
-diff --git a/MP/code/rend2/tr_animation.c b/MP/code/rend2/tr_animation.c
-index 20d9b93..1006c70 100644
---- a/MP/code/rend2/tr_animation.c
-+++ b/MP/code/rend2/tr_animation.c
-@@ -44,7 +44,7 @@ frame.
- //#define DBG_PROFILE_BONES
-
- //-----------------------------------------------------------------------------
--// Static Vars, ugly but easiest (and fastest) means of seperating RB_SurfaceAnim
-+// Static Vars, ugly but easiest (and fastest) means of separating RB_SurfaceAnim
- // and R_CalcBones
-
- static float frontlerp, backlerp;
-diff --git a/MP/code/renderer/tr_animation.c b/MP/code/renderer/tr_animation.c
-index be7b0bf..ce92d56 100644
---- a/MP/code/renderer/tr_animation.c
-+++ b/MP/code/renderer/tr_animation.c
-@@ -44,7 +44,7 @@ frame.
- //#define DBG_PROFILE_BONES
-
- //-----------------------------------------------------------------------------
--// Static Vars, ugly but easiest (and fastest) means of seperating RB_SurfaceAnim
-+// Static Vars, ugly but easiest (and fastest) means of separating RB_SurfaceAnim
- // and R_CalcBones
-
- static float frontlerp, backlerp;
-diff --git a/SP/code/botlib/be_aas_cluster.c b/SP/code/botlib/be_aas_cluster.c
-index 9e78b6a..d133ad4 100644
---- a/SP/code/botlib/be_aas_cluster.c
-+++ b/SP/code/botlib/be_aas_cluster.c
-@@ -152,7 +152,7 @@ int AAS_UpdatePortal( int areanum, int clusternum ) {
- } //end else if
- else
- {
-- Log_Write( "portal using area %d is seperating more than two clusters\r\n", areanum );
-+ Log_Write( "portal using area %d is separating more than two clusters\r\n", areanum );
- //remove the cluster portal flag contents
- ( *aasworld ).areasettings[areanum].contents &= ~AREACONTENTS_CLUSTERPORTAL;
- return qfalse;
-diff --git a/SP/code/game/ai_cast_characters.c b/SP/code/game/ai_cast_characters.c
-index 930fcc9..913169b 100644
---- a/SP/code/game/ai_cast_characters.c
-+++ b/SP/code/game/ai_cast_characters.c
-@@ -1209,7 +1209,7 @@ void AIChar_Pain( gentity_t *ent, gentity_t *attacker, int damage, vec3_t point
- }
- }
-
-- // if we didnt just play a scripted sound, then play one of the default sounds
-+ // if we didn't just play a scripted sound, then play one of the default sounds
- if ( cs->lastScriptSound < level.time ) {
- G_AddEvent( ent, EV_GENERAL_SOUND, G_SoundIndex( aiDefaults[ent->aiCharacter].soundScripts[PAINSOUNDSCRIPT] ) );
- }
-diff --git a/SP/code/game/ai_cast_funcs.c b/SP/code/game/ai_cast_funcs.c
-index 8bd1303..5cf47af 100644
---- a/SP/code/game/ai_cast_funcs.c
-+++ b/SP/code/game/ai_cast_funcs.c
-@@ -1035,7 +1035,7 @@ char *AIFunc_InspectBulletImpact( cast_state_t *cs ) {
- cs->scriptPauseTime = 0;
- return AIFunc_IdleStart( cs );
- }
-- // make sure we didnt change thinkfunc
-+ // make sure we didn't change thinkfunc
- if ( cs->aifunc != AIFunc_InspectBulletImpact ) {
- //G_Error( "scripting passed control out of AIFunc_InspectBulletImpact(), this is bad" );
- return NULL;
-@@ -1715,7 +1715,7 @@ char *AIFunc_ChaseGoal( cast_state_t *cs ) {
- AICast_PredictMovement( cs, 10, frameTime, &move, &ucmd, cs->followEntity );
-
- if ( move.stopevent == PREDICTSTOP_HITENT ) { // success!
-- // make sure we didnt spend a lot of time sliding along an obstacle
-+ // make sure we didn't spend a lot of time sliding along an obstacle
- if ( ( move.frames * frameTime ) < ( 1.0 + ( goaldist / ( bs->cur_ps.speed * bs->cur_ps.runSpeedScale ) ) ) ) {
- trap_EA_Move( cs->entityNum, dir, 400 );
- vectoangles( dir, cs->ideal_viewangles );
-diff --git a/SP/code/game/ai_cast_think.c b/SP/code/game/ai_cast_think.c
-index 8b0fc71..6206553 100644
---- a/SP/code/game/ai_cast_think.c
-+++ b/SP/code/game/ai_cast_think.c
-@@ -1167,7 +1167,7 @@ void AICast_PredictMovement( cast_state_t *cs, int numframes, float frametime, a
- //VectorCopy( thisHitVec, startHitVec );
- VectorCopy( pm.ps->origin, lastOrg );
- }
-- // if we didnt reach the marker, then check for something that blocked us
-+ // if we didn't reach the marker, then check for something that blocked us
- for ( i = 0; i < pm.numtouch; i++ ) {
- if ( pm.touchents[i] == pm.ps->groundEntityNum ) {
- continue;
-diff --git a/SP/code/game/g_mover.c b/SP/code/game/g_mover.c
-index 143006e..9dbb9ab 100644
---- a/SP/code/game/g_mover.c
-+++ b/SP/code/game/g_mover.c
-@@ -364,7 +364,7 @@ qboolean G_TryPushingEntity( gentity_t *check, gentity_t *pusher, vec3_t move
- break;
- }
- }
-- // didnt work, so set the position back
-+ // didn't work, so set the position back
- VectorCopy( org, check->s.pos.trBase );
- if ( check->client ) {
- VectorCopy( org, check->client->ps.origin );
-diff --git a/SP/code/game/g_team.c b/SP/code/game/g_team.c
-index 0240c5b..064fd26 100644
---- a/SP/code/game/g_team.c
-+++ b/SP/code/game/g_team.c
-@@ -179,7 +179,7 @@ void Team_FragBonuses( gentity_t *targ, gentity_t *inflictor, gentity_t *attacke
-
- attacker->client->pers.teamState.carrierdefense++;
- team = attacker->client->sess.sessionTeam;
-- PrintMsg( NULL, "%s" S_COLOR_WHITE " defends %s's flag carrier against an agressive enemy\n",
-+ PrintMsg( NULL, "%s" S_COLOR_WHITE " defends %s's flag carrier against an aggressive enemy\n",
- attacker->client->pers.netname, TeamName( team ) );
- return;
- }
-diff --git a/SP/code/game/g_tramcar.c b/SP/code/game/g_tramcar.c
-index b4aa070..6afeb3e 100644
---- a/SP/code/game/g_tramcar.c
-+++ b/SP/code/game/g_tramcar.c
-@@ -287,7 +287,7 @@ void GetNextTrack( gentity_t *ent ) {
- }
-
- if ( !num_choices ) {
-- G_Printf( "GetNextTrack didnt find a track\n" );
-+ G_Printf( "GetNextTrack didn't find a track\n" );
- return;
- }
-
-diff --git a/SP/code/qcommon/cm_trace.c b/SP/code/qcommon/cm_trace.c
-index 1be5871..2cfa306 100644
---- a/SP/code/qcommon/cm_trace.c
-+++ b/SP/code/qcommon/cm_trace.c
-@@ -1056,7 +1056,7 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t
- }
-
- //
-- // find the point distances to the seperating plane
-+ // find the point distances to the separating plane
- // and the offset for the size of the box
- //
- node = cm.nodes + num;
-diff --git a/SP/code/qcommon/common.c b/SP/code/qcommon/common.c
-index 9a5023b..fe7890f 100644
---- a/SP/code/qcommon/common.c
-+++ b/SP/code/qcommon/common.c
-@@ -440,7 +440,7 @@ void Com_ParseCommandLine( char *commandLine ) {
- com_numConsoleLines = 1;
-
- while ( *commandLine ) {
-- // look for a + seperating character
-+ // look for a + separating character
- // if commandLine came from a file, we might have real line seperators
- if ( *commandLine == '+' || *commandLine == '\n' ) {
- if ( com_numConsoleLines == MAX_CONSOLE_LINES ) {
-diff --git a/SP/code/rend2/tr_animation.c b/SP/code/rend2/tr_animation.c
-index 8ca16b7..1b4b80a 100644
---- a/SP/code/rend2/tr_animation.c
-+++ b/SP/code/rend2/tr_animation.c
-@@ -44,7 +44,7 @@ frame.
- //#define DBG_PROFILE_BONES
-
- //-----------------------------------------------------------------------------
--// Static Vars, ugly but easiest (and fastest) means of seperating RB_SurfaceAnim
-+// Static Vars, ugly but easiest (and fastest) means of separating RB_SurfaceAnim
- // and R_CalcBones
-
- static float frontlerp, backlerp;
-diff --git a/SP/code/renderer/tr_animation.c b/SP/code/renderer/tr_animation.c
-index dffcd56..e0f4bc6 100644
---- a/SP/code/renderer/tr_animation.c
-+++ b/SP/code/renderer/tr_animation.c
-@@ -44,7 +44,7 @@ frame.
- //#define DBG_PROFILE_BONES
-
- //-----------------------------------------------------------------------------
--// Static Vars, ugly but easiest (and fastest) means of seperating RB_SurfaceAnim
-+// Static Vars, ugly but easiest (and fastest) means of separating RB_SurfaceAnim
- // and R_CalcBones
-
- static float frontlerp, backlerp;
diff --git a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
deleted file mode 100644
index a8db417..0000000
--- a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 21 Mar 2016 08:57:10 +0000
-Subject: Introduce NOTSHLIBLDFLAGS, used to link executables only
-
-This can be used for LDFLAGS that would be inappropriate for shared
-libraries, such as the "-fPIE -pie" used to link position-independent
-executables. PIEs make it more difficult to exploit various classes
-of security vulnerability.
-
-Applied-upstream: 1.42e, commit:https://github.com/iortcw/iortcw/commit/e5799d7f45d3f252b78eaee8632aaff1b84ab16e
----
- MP/Makefile | 8 ++++----
- SP/Makefile | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/MP/Makefile b/MP/Makefile
-index fc90e86..6c7327b 100644
---- a/MP/Makefile
-+++ b/MP/Makefile
-@@ -2209,7 +2209,7 @@ endif
- ifneq ($(USE_RENDERER_DLOPEN),0)
- $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
-
-@@ -2225,13 +2225,13 @@ $(B)/renderer_mp_rend2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(FTO
- else
- $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(FTOBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(FTOBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
-
- $(B)/$(CLIENTBIN)_rend2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(FTOBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(FTOBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
- endif
-@@ -2380,7 +2380,7 @@ endif
-
- $(B)/$(SERVERBIN)$(FULLBINEXT): $(Q3DOBJ)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
-+ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
-
-
-
-diff --git a/SP/Makefile b/SP/Makefile
-index 245f00f..ad078af 100644
---- a/SP/Makefile
-+++ b/SP/Makefile
-@@ -2180,7 +2180,7 @@ endif
- ifneq ($(USE_RENDERER_DLOPEN),0)
- $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
-
-@@ -2196,13 +2196,13 @@ $(B)/renderer_sp_rend2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(FTO
- else
- $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(FTOBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(FTOBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
-
- $(B)/$(CLIENTBIN)_rend2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(FTOBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CXX) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(FTOBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
- endif
-@@ -2347,7 +2347,7 @@ endif
-
- $(B)/$(SERVERBIN)$(FULLBINEXT): $(Q3DOBJ)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
-+ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
-
-
-
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
deleted file mode 100644
index b522626..0000000
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 21 Mar 2016 08:12:37 +0000
-Subject: Pick up date from SOURCE_DATE_EPOCH, for reproducible builds
-
-The goal of reproducible builds is that a rebuild of the same source
-code with the same compiler, libraries, etc. should result in the same
-binaries. SOURCE_DATE_EPOCH provides a standard way for build systems
-to fill in the date of the latest source change, typically from a git
-commit or from metadata like the debian/changelog in Debian packages.
-
-Applied-upstream: 1.42e, commit:https://github.com/iortcw/iortcw/commit/22d1cc9bdc6ab24efff50ec3b6391f337dd944dd
----
- MP/Makefile | 5 +++++
- MP/code/game/g_main.c | 4 ++--
- MP/code/qcommon/common.c | 6 +++---
- MP/code/qcommon/q_shared.h | 4 ++++
- MP/code/sys/sys_main.c | 2 +-
- SP/Makefile | 5 +++++
- SP/code/game/g_main.c | 4 ++--
- SP/code/qcommon/common.c | 4 ++--
- SP/code/qcommon/q_shared.h | 4 ++++
- SP/code/sys/sys_main.c | 2 +-
- 10 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/MP/Makefile b/MP/Makefile
-index a921004..fc90e86 100644
---- a/MP/Makefile
-+++ b/MP/Makefile
-@@ -1224,6 +1224,11 @@ ifeq ($(USE_PBMD5),1)
- CLIENT_CFLAGS += -DUSE_PBMD5
- endif
-
-+# https://reproducible-builds.org/specs/source-date-epoch/
-+ifdef SOURCE_DATE_EPOCH
-+ BASE_CFLAGS += -DPRODUCT_DATE=\\\"$(shell date --date="@$$SOURCE_DATE_EPOCH" "+%b %_d %Y" | sed -e 's/ /\\\ /'g)\\\"
-+endif
-+
- BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
- BASE_CFLAGS += -Wformat=2 -Wformat-security -Wno-format-nonliteral
- BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
-diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c
-index f797c21..e151869 100644
---- a/MP/code/game/g_main.c
-+++ b/MP/code/game/g_main.c
-@@ -168,7 +168,7 @@ cvarTable_t gameCvarTable[] = {
-
- // noset vars
- { NULL, "gamename", GAMEVERSION, CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
-- { NULL, "gamedate", __DATE__, CVAR_ROM, 0, qfalse },
-+ { NULL, "gamedate", PRODUCT_DATE, CVAR_ROM, 0, qfalse },
- { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse },
-
- // latched vars
-@@ -1095,7 +1095,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
- if ( trap_Cvar_VariableIntegerValue( "g_gametype" ) != GT_SINGLE_PLAYER ) {
- G_Printf( "------- Game Initialization -------\n" );
- G_Printf( "gamename: %s\n", GAMEVERSION );
-- G_Printf( "gamedate: %s\n", __DATE__ );
-+ G_Printf( "gamedate: %s\n", PRODUCT_DATE );
- }
-
- srand( randomSeed );
-diff --git a/MP/code/qcommon/common.c b/MP/code/qcommon/common.c
-index 87cd7bd..81c51d2 100644
---- a/MP/code/qcommon/common.c
-+++ b/MP/code/qcommon/common.c
-@@ -2701,7 +2701,7 @@ void Com_Init( char *commandLine ) {
- // TTimo gcc warning: variable `safeMode' might be clobbered by `longjmp' or `vfork'
- volatile qboolean safeMode = qtrue;
-
-- Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, __DATE__ );
-+ Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
-
- if ( setjmp( abortframe ) ) {
- Sys_Error( "Error during initialization" );
-@@ -2825,8 +2825,8 @@ void Com_Init( char *commandLine ) {
- com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE );
- com_recommendedSet = Cvar_Get( "com_recommendedSet", "0", CVAR_ARCHIVE );
-
-- s = va( "%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
-- t = va( "%s %s %s", OLDVERSION, PLATFORM_STRING, __DATE__ );
-+ s = va( "%s %s %s", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
-+ t = va( "%s %s %s", OLDVERSION, PLATFORM_STRING, PRODUCT_DATE );
- com_fsgame = Cvar_Get( "fs_game", "", CVAR_INIT | CVAR_SYSTEMINFO );
- com_legacyversion = Cvar_Get( "com_legacyversion", "0", CVAR_ARCHIVE );
-
-diff --git a/MP/code/qcommon/q_shared.h b/MP/code/qcommon/q_shared.h
-index 3117a26..ee56bba 100644
---- a/MP/code/qcommon/q_shared.h
-+++ b/MP/code/qcommon/q_shared.h
-@@ -86,6 +86,10 @@ If you have questions concerning this license or the applicable additional terms
- #define OLD_PRODUCT_VERSION "1.41-MP"
- #endif
-
-+#ifndef PRODUCT_DATE
-+# define PRODUCT_DATE __DATE__
-+#endif
-+
- #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
- #define OLDVERSION OLD_PRODUCT_NAME " " OLD_PRODUCT_VERSION
-
-diff --git a/MP/code/sys/sys_main.c b/MP/code/sys/sys_main.c
-index 78b73d9..68c78a5 100644
---- a/MP/code/sys/sys_main.c
-+++ b/MP/code/sys/sys_main.c
-@@ -551,7 +551,7 @@ void Sys_ParseArgs( int argc, char **argv )
- if( !strcmp( argv[1], "--version" ) ||
- !strcmp( argv[1], "-v" ) )
- {
-- const char* date = __DATE__;
-+ const char* date = PRODUCT_DATE;
- #ifdef DEDICATED
- fprintf( stdout, Q3_VERSION " dedicated server (%s)\n", date );
- #else
-diff --git a/SP/Makefile b/SP/Makefile
-index f127b4f..245f00f 100644
---- a/SP/Makefile
-+++ b/SP/Makefile
-@@ -1201,6 +1201,11 @@ ifeq ($(USE_BLOOM),1)
- CLIENT_CFLAGS += -DUSE_BLOOM
- endif
-
-+# https://reproducible-builds.org/specs/source-date-epoch/
-+ifdef SOURCE_DATE_EPOCH
-+ BASE_CFLAGS += -DPRODUCT_DATE=\\\"$(shell date --date="@$$SOURCE_DATE_EPOCH" "+%b %_d %Y" | sed -e 's/ /\\\ /'g)\\\"
-+endif
-+
- BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
- BASE_CFLAGS += -Wformat=2 -Wformat-security -Wno-format-nonliteral
- BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
-diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
-index 823c846..666fe03 100644
---- a/SP/code/game/g_main.c
-+++ b/SP/code/game/g_main.c
-@@ -148,7 +148,7 @@ cvarTable_t gameCvarTable[] = {
-
- // noset vars
- { NULL, "gamename", GAMEVERSION, CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
-- { NULL, "gamedate", __DATE__, CVAR_ROM, 0, qfalse },
-+ { NULL, "gamedate", PRODUCT_DATE, CVAR_ROM, 0, qfalse },
- { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse },
-
- // latched vars
-@@ -1177,7 +1177,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
- if ( trap_Cvar_VariableIntegerValue( "g_gametype" ) != GT_SINGLE_PLAYER ) {
- G_Printf( "------- Game Initialization -------\n" );
- G_Printf( "gamename: %s\n", GAMEVERSION );
-- G_Printf( "gamedate: %s\n", __DATE__ );
-+ G_Printf( "gamedate: %s\n", PRODUCT_DATE );
- }
-
- srand( randomSeed );
-diff --git a/SP/code/qcommon/common.c b/SP/code/qcommon/common.c
-index 99954d3..9a5023b 100644
---- a/SP/code/qcommon/common.c
-+++ b/SP/code/qcommon/common.c
-@@ -2252,7 +2252,7 @@ void Com_Init( char *commandLine ) {
- char *s;
- int qport;
-
-- Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, __DATE__ );
-+ Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
-
- if ( setjmp( abortframe ) ) {
- Sys_Error( "Error during initialization" );
-@@ -2373,7 +2373,7 @@ void Com_Init( char *commandLine ) {
-
- Cvar_Get( "savegame_loading", "0", CVAR_ROM );
-
-- s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
-+ s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
- com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
- com_gamename = Cvar_Get("com_gamename", GAMENAME_FOR_MASTER, CVAR_SERVERINFO | CVAR_INIT);
- com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_INIT);
-diff --git a/SP/code/qcommon/q_shared.h b/SP/code/qcommon/q_shared.h
-index a4a0fd1..1685ad6 100644
---- a/SP/code/qcommon/q_shared.h
-+++ b/SP/code/qcommon/q_shared.h
-@@ -79,6 +79,10 @@ If you have questions concerning this license or the applicable additional terms
- #define PRODUCT_VERSION "1.42d"
- #endif
-
-+#ifndef PRODUCT_DATE
-+# define PRODUCT_DATE __DATE__
-+#endif
-+
- #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
-
- #define MAX_TEAMNAME 32
-diff --git a/SP/code/sys/sys_main.c b/SP/code/sys/sys_main.c
-index f665b0d..b23d383 100644
---- a/SP/code/sys/sys_main.c
-+++ b/SP/code/sys/sys_main.c
-@@ -551,7 +551,7 @@ void Sys_ParseArgs( int argc, char **argv )
- if( !strcmp( argv[1], "--version" ) ||
- !strcmp( argv[1], "-v" ) )
- {
-- const char* date = __DATE__;
-+ const char* date = PRODUCT_DATE;
- #ifdef DEDICATED
- fprintf( stdout, Q3_VERSION " dedicated server (%s)\n", date );
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 39a0d76..a01aa2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
-Fix-some-spelling-errors.patch
-Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
debian/Disable-client-side-auto-download-by-default.patch
debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
debian/Default-to-non-fullscreen.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list