[openjk] 08/15: Refresh patches

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit caa9e4aa953def3b28c73e8b7ae0d9893eb93412
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 1 23:10:56 2015 +0100

    Refresh patches
---
 ...leep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch | 20 ++++++++++----------
 ...isarm-debug-code-that-writes-to-c-nofreeent.patch |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
index 9bfb866..dde51dd 100644
--- a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
+++ b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
@@ -25,7 +25,7 @@ Bug: https://github.com/JACoders/OpenJK/issues/507
  11 files changed, 235 insertions(+), 157 deletions(-)
 
 diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index e35e37a..e84a88a 100644
+index 68aa2f3..9817462 100644
 --- a/code/qcommon/common.cpp
 +++ b/code/qcommon/common.cpp
 @@ -48,7 +48,6 @@ cvar_t	*com_speeds;
@@ -122,7 +122,7 @@ index e35e37a..e84a88a 100644
  Com_Frame
  =================
  */
-@@ -1351,7 +1350,8 @@ void Com_Frame( void ) {
+@@ -1348,7 +1347,8 @@ void Com_Frame( void ) {
  	{
  		int		timeBeforeFirstEvents = 0, timeBeforeServer = 0, timeBeforeEvents = 0, timeBeforeClient = 0, timeAfter = 0;
  		int		msec, minMsec;
@@ -132,7 +132,7 @@ index e35e37a..e84a88a 100644
  
  		// write config file if anything changed
  		Com_WriteConfiguration(); 
-@@ -1363,25 +1363,43 @@ void Com_Frame( void ) {
+@@ -1360,25 +1360,43 @@ void Com_Frame( void ) {
  			timeBeforeFirstEvents = Sys_Milliseconds ();
  		}
  
@@ -258,7 +258,7 @@ index c8abf18..37a012a 100644
 -	return false;
 -}
 diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index b1d83af..4d5e577 100644
+index e3df37a..899ddcc 100644
 --- a/codemp/qcommon/common.cpp
 +++ b/codemp/qcommon/common.cpp
 @@ -43,9 +43,7 @@ cvar_t	*com_developer;
@@ -287,7 +287,7 @@ index b1d83af..4d5e577 100644
  int			com_frameNumber;
  
  qboolean	com_errorEntered = qfalse;
-@@ -916,36 +914,6 @@ int Com_EventLoop( void ) {
+@@ -923,36 +921,6 @@ int Com_EventLoop( void ) {
  			}
  			Cbuf_AddText( "\n" );
  			break;
@@ -324,7 +324,7 @@ index b1d83af..4d5e577 100644
  		}
  
  		// free any block data
-@@ -1235,15 +1203,12 @@ void Com_Init( char *commandLine ) {
+@@ -1242,15 +1210,12 @@ void Com_Init( char *commandLine ) {
  		//
  		// init commands and vars
  		//
@@ -340,7 +340,7 @@ index b1d83af..4d5e577 100644
  		com_speeds = Cvar_Get ("com_speeds", "0", 0);
  		com_timedemo = Cvar_Get ("timedemo", "0", 0);
  		com_cameraMode = Cvar_Get ("com_cameraMode", "0", CVAR_CHEAT);
-@@ -1264,6 +1229,7 @@ void Com_Init( char *commandLine ) {
+@@ -1271,6 +1236,7 @@ void Com_Init( char *commandLine ) {
  #endif
  
  		com_affinity = Cvar_Get( "com_affinity", "1", CVAR_ARCHIVE );
@@ -348,7 +348,7 @@ index b1d83af..4d5e577 100644
  
  		com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE);
  
-@@ -1455,6 +1421,26 @@ extern int G2Time_PreciseFrame;
+@@ -1462,6 +1428,26 @@ extern int G2Time_PreciseFrame;
  
  /*
  =================
@@ -375,7 +375,7 @@ index b1d83af..4d5e577 100644
  Com_Frame
  =================
  */
-@@ -1466,7 +1452,8 @@ void Com_Frame( void ) {
+@@ -1473,7 +1459,8 @@ void Com_Frame( void ) {
  		G2PerformanceTimer_PreciseFrame.Start();
  #endif
  		int		msec, minMsec;
@@ -385,7 +385,7 @@ index b1d83af..4d5e577 100644
  
  		int		timeBeforeFirstEvents = 0;
  		int           timeBeforeServer = 0;
-@@ -1484,25 +1471,53 @@ void Com_Frame( void ) {
+@@ -1491,25 +1478,53 @@ void Com_Frame( void ) {
  			timeBeforeFirstEvents = Sys_Milliseconds ();
  		}
  
diff --git a/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch b/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
index 3096cb0..e8cc824 100644
--- a/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
+++ b/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
@@ -12,7 +12,7 @@ Forwarded: no
  1 file changed, 2 insertions(+)
 
 diff --git a/code/game/g_utils.cpp b/code/game/g_utils.cpp
-index ee622b0..345c5a9 100644
+index e59c3f2..b22bac7 100644
 --- a/code/game/g_utils.cpp
 +++ b/code/game/g_utils.cpp
 @@ -818,6 +818,7 @@ gentity_t *G_Spawn( void )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git