[openjk] 05/05: unfuzz 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 f0f21fb4e0ee6971c9b583035cce266901209a02
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Feb 5 23:59:28 2015 +0000

    unfuzz patches
---
 ...k-renderer-and-clients-to-a-bunch-of-unnece.patch |  2 +-
 ...leep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
index ebe4747..e52b4f5 100644
--- a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
+++ b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
@@ -12,7 +12,7 @@ They only directly use libGL.
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
-index ac30195..5a24f15 100644
+index 567c366..b9d0377 100644
 --- a/code/CMakeLists.txt
 +++ b/code/CMakeLists.txt
 @@ -30,7 +30,7 @@ if(BuildSPEngine OR BuildJK2SPEngine)
diff --git a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
index 5c35f5f..aa0fb1b 100644
--- a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
+++ b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
@@ -23,7 +23,7 @@ mostly by Thilo Schulz, with contributions from Zack Middleton and
  11 files changed, 243 insertions(+), 170 deletions(-)
 
 diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index 23c2a60..a67f2e3 100644
+index a7defc4..927b69e 100644
 --- a/code/qcommon/common.cpp
 +++ b/code/qcommon/common.cpp
 @@ -52,6 +52,7 @@ cvar_t	*sv_paused;
@@ -174,10 +174,10 @@ index 23c2a60..a67f2e3 100644
  		msec = Com_ModifyMsec( msec, fractionMsec);
  	
 diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 39abea9..34bf0a5 100644
+index 03b2c5e..5415d5d 100644
 --- a/code/qcommon/qcommon.h
 +++ b/code/qcommon/qcommon.h
-@@ -571,6 +571,7 @@ unsigned	Com_BlockChecksum( const void *buffer, int length );
+@@ -594,6 +594,7 @@ unsigned	Com_BlockChecksum( const void *buffer, int length );
  int			Com_Filter(const char *filter, const char *name, int casesensitive);
  int			Com_FilterPath(const char *filter, const char *name, int casesensitive);
  qboolean	Com_SafeMode( void );
@@ -185,7 +185,7 @@ index 39abea9..34bf0a5 100644
  
  void		Com_StartupVariable( const char *match );
  // checks for and removes command line "+set var arg" constructs
-@@ -601,7 +602,6 @@ extern	int		timeInPVSCheck;
+@@ -624,7 +625,6 @@ extern	int		timeInPVSCheck;
  extern	int		numTraces;
  
  extern	int		com_frameTime;
@@ -193,7 +193,7 @@ index 39abea9..34bf0a5 100644
  
  extern	qboolean	com_errorEntered;
  
-@@ -777,8 +777,7 @@ typedef enum {
+@@ -800,8 +800,7 @@ typedef enum {
  	SE_CHAR,	// evValue is an ascii char
  	SE_MOUSE,	// evValue and evValue2 are reletive signed x / y moves
  	SE_JOYSTICK_AXIS,	// evValue is an axis number and evValue2 is the current state (-127 to 127)
@@ -203,19 +203,19 @@ index 39abea9..34bf0a5 100644
  } sysEventType_t;
  
  typedef struct {
-@@ -842,6 +841,7 @@ const char *Sys_Basename( char *path );
+@@ -865,6 +864,7 @@ const char *Sys_Basename( char *path );
  
  char **Sys_ListFiles( const char *directory, const char *extension, char *filter, int *numfiles, qboolean wantsubs );
  void	Sys_FreeFileList( char **filelist );
 +void	Sys_Sleep(int msec);
  
  qboolean Sys_LowPhysicalMemory();
- qboolean Sys_FileOutOfDate( const char *psFinalFileName /* dest */, const char *psDataFileName /* src */ );
+ 
 diff --git a/code/win32/win_main.cpp b/code/win32/win_main.cpp
-index 860c730..b25eae2 100644
+index 30c7f1d..439ee64 100644
 --- a/code/win32/win_main.cpp
 +++ b/code/win32/win_main.cpp
-@@ -1055,6 +1055,14 @@ static int ParseCommandLine(char *cmdline, char **argv)
+@@ -963,6 +963,14 @@ static int ParseCommandLine(char *cmdline, char **argv)
  //=======================================================================
  //int	totalMsec, countMsec;
  
@@ -627,7 +627,7 @@ index 70522de..6cf7fcf 100644
  
  typedef struct sysEvent_s {
 diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
-index 1e77dd1..c87f8a3 100644
+index 1a9a798..9e9ced9 100644
 --- a/codemp/server/sv_main.cpp
 +++ b/codemp/server/sv_main.cpp
 @@ -8,7 +8,7 @@ server_t		sv;					// local server

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