[iortcw] 06/08: Drop patch to default to non-fullscreen
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 c61e43536c2503c8f53ac669180880df04cd9161
Author: Simon McVittie <smcv at debian.org>
Date: Sun Nov 20 22:10:04 2016 +0000
Drop patch to default to non-fullscreen
Upstream changed the default to be windowed, except for OpenGLES
builds, which we don't do in Debian.
---
.../patches/debian/Default-to-non-fullscreen.patch | 66 ----------------------
...able-client-side-auto-download-by-default.patch | 4 +-
...-methods-prevent-overwriting-DLLs-CVE-201.patch | 16 +++---
...upport-for-downloading-executable-updates.patch | 20 +++----
debian/patches/series | 1 -
5 files changed, 20 insertions(+), 87 deletions(-)
diff --git a/debian/patches/debian/Default-to-non-fullscreen.patch b/debian/patches/debian/Default-to-non-fullscreen.patch
deleted file mode 100644
index 1cee6f4..0000000
--- a/debian/patches/debian/Default-to-non-fullscreen.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Tue, 30 Dec 2014 20:47:20 +0000
-Subject: Default to non-fullscreen
-
-Debian Games Team policy is to start in non-fullscreen if we can.
-
-Forwarded: not-needed, Debian-specific
----
- MP/code/rend2/tr_init.c | 2 +-
- MP/code/renderer/tr_init.c | 2 +-
- SP/code/rend2/tr_init.c | 2 +-
- SP/code/renderer/tr_init.c | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
-index 0bae878..758de7f 100644
---- a/MP/code/rend2/tr_init.c
-+++ b/MP/code/rend2/tr_init.c
-@@ -1282,7 +1282,7 @@ void R_Register( void ) {
- r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "0", 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 );
-- r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH );
-+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE | CVAR_LATCH );
- r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH );
- 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/MP/code/renderer/tr_init.c b/MP/code/renderer/tr_init.c
-index 25ed2bd..f2b96bb 100644
---- a/MP/code/renderer/tr_init.c
-+++ b/MP/code/renderer/tr_init.c
-@@ -1181,7 +1181,7 @@ void R_Register( void ) {
- #else
- r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
- #endif
-- r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH );
-+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE | CVAR_LATCH );
- r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH );
- 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/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
-index 6f41ae5..7b7eb59 100644
---- a/SP/code/rend2/tr_init.c
-+++ b/SP/code/rend2/tr_init.c
-@@ -1304,7 +1304,7 @@ void R_Register( void ) {
- r_overBrightBits = ri.Cvar_Get( "r_overBrightBits", "0", 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 );
-- r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH );
-+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE | CVAR_LATCH );
- r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH );
- 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/SP/code/renderer/tr_init.c b/SP/code/renderer/tr_init.c
-index 4cb656e..16a2b75 100644
---- a/SP/code/renderer/tr_init.c
-+++ b/SP/code/renderer/tr_init.c
-@@ -1204,7 +1204,7 @@ void R_Register( void ) {
- #else
- r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
- #endif
-- r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH );
-+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE | CVAR_LATCH );
- r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH );
- 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/debian/patches/debian/Disable-client-side-auto-download-by-default.patch b/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
index 12b7455..8f75a24 100644
--- a/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
+++ b/debian/patches/debian/Disable-client-side-auto-download-by-default.patch
@@ -13,10 +13,10 @@ anyway.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
-index c6dea1c..46f6edb 100644
+index bbdd4f4..582d905 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
-@@ -4041,7 +4041,7 @@ void CL_Init( void ) {
+@@ -4046,7 +4046,7 @@ void CL_Init( void ) {
cl_showMouseRate = Cvar_Get( "cl_showmouserate", "0", 0 );
diff --git a/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch b/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
index fa1796c..ae028a3 100644
--- a/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
+++ b/debian/patches/debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
@@ -33,10 +33,10 @@ Upstream rejected this change, but we want it in Debian anyway.
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
-index 71cd350..1e37a2f 100644
+index 603550e..0d71189 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
-@@ -685,7 +685,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
+@@ -687,7 +687,9 @@ fileHandle_t FS_SV_FOpenFileWrite( const char *filename ) {
Com_Printf( "FS_SV_FOpenFileWrite: %s\n", ospath );
}
@@ -47,7 +47,7 @@ index 71cd350..1e37a2f 100644
if( FS_CreatePath( ospath ) ) {
return 0;
-@@ -904,7 +906,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
+@@ -906,7 +908,9 @@ fileHandle_t FS_FOpenFileWrite( const char *filename ) {
Com_Printf( "FS_FOpenFileWrite: %s\n", ospath );
}
@@ -58,7 +58,7 @@ index 71cd350..1e37a2f 100644
if ( FS_CreatePath( ospath ) ) {
return 0;
-@@ -1546,7 +1550,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
+@@ -1548,7 +1552,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
}
}
@@ -67,7 +67,7 @@ index 71cd350..1e37a2f 100644
// extract the dlls from the mp_bin.pk3 so
// that they can be referenced
if (Q_stricmp(name, "qagame"))
-@@ -1581,7 +1585,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
+@@ -1583,7 +1587,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
// TTimo
// relevant to client only
@@ -77,7 +77,7 @@ index 71cd350..1e37a2f 100644
==================
FS_CL_ExtractFromPakFile
diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
-index 101c44d..6fa4a41 100644
+index 340b105..2f42bff 100644
--- a/SP/code/qcommon/files.c
+++ b/SP/code/qcommon/files.c
@@ -175,6 +175,8 @@ or configs will never get loaded from disk!
@@ -89,7 +89,7 @@ index 101c44d..6fa4a41 100644
// every time a new demo pk3 file is built, this checksum must be updated.
// the easiest way to get it is to just run the game and see what it spits out
#define DEMO_PAK0_CHECKSUM 2985661941u
-@@ -609,6 +611,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
+@@ -611,6 +613,10 @@ static void FS_CopyFile( char *fromOSPath, char *toOSPath ) {
return;
}
@@ -100,7 +100,7 @@ index 101c44d..6fa4a41 100644
f = Sys_FOpen( fromOSPath, "rb" );
if ( !f ) {
return;
-@@ -658,6 +664,10 @@ void FS_CopyFileOS( char *from, char *to ) {
+@@ -660,6 +666,10 @@ void FS_CopyFileOS( char *from, char *to ) {
return;
}
diff --git a/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
index 9fc0cca..d22bba4 100644
--- a/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
+++ b/debian/patches/debian/Remove-support-for-downloading-executable-updates.patch
@@ -14,10 +14,10 @@ in Debian anyway.
3 files changed, 2 insertions(+), 189 deletions(-)
diff --git a/MP/code/client/cl_main.c b/MP/code/client/cl_main.c
-index 46f6edb..72e843a 100644
+index 582d905..610a673 100644
--- a/MP/code/client/cl_main.c
+++ b/MP/code/client/cl_main.c
-@@ -2196,24 +2196,7 @@ void CL_DownloadsComplete( void ) {
+@@ -2199,24 +2199,7 @@ void CL_DownloadsComplete( void ) {
// DHM - Nerve :: Auto-update (not finished yet)
if ( autoupdateStarted ) {
@@ -43,7 +43,7 @@ index 46f6edb..72e843a 100644
}
#ifdef USE_CURL
-@@ -2906,14 +2889,6 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
+@@ -2911,14 +2894,6 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
}
}
@@ -58,7 +58,7 @@ index 46f6edb..72e843a 100644
#ifdef LEGACY_PROTOCOL
Netchan_Setup(NS_CLIENT, &clc.netchan, from, Cvar_VariableValue("net_qport"),
clc.challenge, clc.compat);
-@@ -3522,119 +3497,9 @@ void CL_StartHunkUsers( qboolean rendererOnly ) {
+@@ -3527,119 +3502,9 @@ void CL_StartHunkUsers( qboolean rendererOnly ) {
// DHM - Nerve
void CL_CheckAutoUpdate( void ) {
@@ -178,7 +178,7 @@ index 46f6edb..72e843a 100644
}
// DHM - Nerve
-@@ -3990,7 +3855,7 @@ void CL_Init( void ) {
+@@ -3995,7 +3860,7 @@ void CL_Init( void ) {
#ifdef UPDATE_SERVER_NAME
cl_motd = Cvar_Get( "cl_motd", "1", 0 );
#endif
@@ -187,7 +187,7 @@ index 46f6edb..72e843a 100644
cl_timeout = Cvar_Get( "cl_timeout", "200", 0 );
-@@ -4518,30 +4383,6 @@ CL_UpdateInfoPacket
+@@ -4523,30 +4388,6 @@ CL_UpdateInfoPacket
===================
*/
void CL_UpdateInfoPacket( netadr_t from ) {
@@ -219,10 +219,10 @@ index 46f6edb..72e843a 100644
// DHM - Nerve
diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
-index fe5fa79..86036e9 100644
+index 1f23d0f..b1fff59 100644
--- a/MP/code/qcommon/qcommon.h
+++ b/MP/code/qcommon/qcommon.h
-@@ -1254,12 +1254,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit ); // NERVE - S
+@@ -1258,12 +1258,6 @@ void Sys_StartProcess( char *cmdline, qboolean doexit ); // NERVE - S
void Sys_OpenURL( const char *url, qboolean doexit ); // NERVE - SMF
int Sys_GetHighQualityCPU( void );
@@ -236,10 +236,10 @@ index fe5fa79..86036e9 100644
{
DR_YES = 0,
diff --git a/MP/code/sys/sys_unix.c b/MP/code/sys/sys_unix.c
-index 8558749..81d3135 100644
+index 941b689..8edf719 100644
--- a/MP/code/sys/sys_unix.c
+++ b/MP/code/sys/sys_unix.c
-@@ -903,28 +903,6 @@ qboolean Sys_PIDIsRunning( int pid )
+@@ -935,28 +935,6 @@ qboolean Sys_PIDIsRunning( int pid )
return kill( pid, 0 ) == 0;
}
diff --git a/debian/patches/series b/debian/patches/series
index a01aa2b..68767f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
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
debian/Remove-support-for-downloading-executable-updates.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