[ioquake3] 07/09: Refresh patches
Simon McVittie
smcv at debian.org
Thu Jan 11 09:34:21 UTC 2018
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag debian/1.36+u20180108_dfsg-1
in repository ioquake3.
commit 1467e0e170b47b7d4248222a37469c543b88a1fe
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jan 11 08:30:38 2018 +0000
Refresh patches
---
debian/changelog | 1 +
...-special-vmMagic-that-causes-equivalent-native-.patch | 16 ++++++++--------
...v_dorestart-which-can-be-set-by-game-code-to-re.patch | 10 +++++-----
debian/patches/debian/Let-servers-set-sv_fps-too.patch | 2 +-
...Run-in-a-window-by-default-on-new-installations.patch | 8 ++++----
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c365ef..1cedc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ioquake3 (1.36+u20180108~dfsg-1) UNRELEASED; urgency=medium
* Declare compliance with Debian Policy 4.1.3
* Update Homepage field to use a https URL
* New upstream snapshot (commit 6387c336)
+ - Refresh patches
-- Simon McVittie <smcv at debian.org> Sat, 30 Dec 2017 11:36:43 +0000
diff --git a/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index cbe5020..607d81e 100644
--- a/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++ b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
@@ -26,10 +26,10 @@ Forwarded: no
4 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 92a9e40..107ef13 100644
+index 246b3cd..91561b6 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
-@@ -1420,7 +1420,7 @@ Return the searchpath in "startSearch".
+@@ -1443,7 +1443,7 @@ Return the searchpath in "startSearch".
=================
*/
@@ -38,7 +38,7 @@ index 92a9e40..107ef13 100644
{
searchpath_t *search, *lastSearch;
directory_t *dir;
-@@ -1444,7 +1444,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1467,7 +1467,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
while(search)
{
@@ -47,7 +47,7 @@ index 92a9e40..107ef13 100644
{
dir = search->dir;
-@@ -1467,7 +1467,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1490,7 +1490,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
return VMI_COMPILED;
}
}
@@ -57,7 +57,7 @@ index 92a9e40..107ef13 100644
pack = search->pack;
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index f8cd035..2487f4a 100644
+index 2880f70..8b9fb93 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -627,7 +627,7 @@ qboolean FS_FileExists( const char *file );
@@ -85,7 +85,7 @@ index 9f2b5fb..3dc8fbb 100644
int vmMagic;
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
-index e8818a6..f1fc425 100644
+index 03bdb96..d7b2294 100644
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
@@ -371,6 +371,7 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, qboolean unpure)
@@ -151,7 +151,7 @@ index e8818a6..f1fc425 100644
if( LittleLong( header.h->vmMagic ) == VM_MAGIC_VER2 ) {
Com_Printf( "...which has vmMagic VM_MAGIC_VER2\n" );
-@@ -610,7 +659,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
+@@ -612,7 +661,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
do
{
@@ -160,7 +160,7 @@ index e8818a6..f1fc425 100644
if(retval == VMI_NATIVE)
{
-@@ -642,6 +691,12 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
+@@ -644,6 +693,12 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
vm->systemCall = systemCalls;
diff --git a/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch b/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
index dba3e81..7aab8eb 100644
--- a/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+++ b/debian/patches/debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
@@ -12,10 +12,10 @@ Forwarded: no
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/code/server/server.h b/code/server/server.h
-index 39d6f4d..ed6a2f6 100644
+index ec1620a..4bcb3a0 100644
--- a/code/server/server.h
+++ b/code/server/server.h
-@@ -286,6 +286,7 @@ extern cvar_t *sv_dlRate;
+@@ -288,6 +288,7 @@ extern cvar_t *sv_dlRate;
extern cvar_t *sv_minPing;
extern cvar_t *sv_maxPing;
extern cvar_t *sv_gametype;
@@ -24,7 +24,7 @@ index 39d6f4d..ed6a2f6 100644
extern cvar_t *sv_floodProtect;
extern cvar_t *sv_lanForceRate;
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
-index 5f26b85..8956671 100644
+index 2ba8194..f9176fe 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -173,6 +173,9 @@ static void SV_Map_f( void ) {
@@ -50,7 +50,7 @@ index 5f26b85..8956671 100644
// restart the map the slow way
Q_strncpyz( mapname, Cvar_VariableString( "mapname" ), sizeof( mapname ) );
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
-index ae9086e..1484ceb 100644
+index aba0e8d..ee8b6a4 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -638,6 +638,7 @@ void SV_Init (void)
@@ -62,7 +62,7 @@ index ae9086e..1484ceb 100644
sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM);
sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO);
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 993910f..888ca8b 100644
+index 4d94c1e..40501d2 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -55,6 +55,7 @@ cvar_t *sv_dlRate;
diff --git a/debian/patches/debian/Let-servers-set-sv_fps-too.patch b/debian/patches/debian/Let-servers-set-sv_fps-too.patch
index 7ee7921..0bbef93 100644
--- a/debian/patches/debian/Let-servers-set-sv_fps-too.patch
+++ b/debian/patches/debian/Let-servers-set-sv_fps-too.patch
@@ -7,7 +7,7 @@ Subject: Let servers set sv_fps, too
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
-index 3968250..afb9377 100644
+index 318c8d8..e3151f0 100644
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
@@ -415,9 +415,9 @@ void CL_SystemInfoChanged( void ) {
diff --git a/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
index 5e74263..2679468 100644
--- a/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
+++ b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
@@ -20,10 +20,10 @@ Forwarded: no, Debian-specific
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
-index 15e7972..701c182 100644
+index 62b590e..cd506db 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
-@@ -1030,7 +1030,7 @@ void R_Register( void )
+@@ -1044,7 +1044,7 @@ void R_Register( void )
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
@@ -33,10 +33,10 @@ index 15e7972..701c182 100644
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index 2e65a52..59cfda2 100644
+index 2a91d53..244cceb 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
-@@ -1184,8 +1184,8 @@ void R_Register( void )
+@@ -1187,8 +1187,8 @@ void R_Register( void )
ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list