[openjk] 01/08: update patches
Simon McVittie
smcv at debian.org
Fri May 8 22:44:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit d26a1a66a70d9583af3569b27458301bb753fd81
Author: Simon McVittie <smcv at debian.org>
Date: Fri May 8 09:15:09 2015 +0100
update patches
---
...renderer-and-clients-to-a-bunch-of-unnece.patch | 2 +-
...ove-cstdint-usage-from-icarus-tokenizer.h.patch | 33 +++++++++++++++++++
...include-string.h-for-strcmp-memcpy-in-inl.patch | 37 ++++++++++++++++++++++
...tokenizer-include-cstring-for-strcmp-memc.patch | 21 ------------
...eViewAngles-fix-use-of-uninitialized-var.patch} | 7 ++--
...P-JK2-g_savegame-silence-compiler-warning.patch | 2 +-
.../Select-C-11-mode-when-compiling-with-g.patch | 25 ---------------
.../Use-C-11-compliant-string-concatenation.patch | 26 +++++++--------
...ep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch | 4 +--
.../codeJK2-replace-__cdecl-with-QDECL.patch | 2 +-
debian/patches/series | 12 +++----
11 files changed, 97 insertions(+), 74 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 c30c9fd..b1660f1 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
@@ -26,7 +26,7 @@ index 5cd7c34..53b9c02 100644
set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${OpenJKLibDir})
diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
-index 31a80d5..b67389b 100644
+index b031541..d1137d3 100644
--- a/codemp/CMakeLists.txt
+++ b/codemp/CMakeLists.txt
@@ -367,7 +367,7 @@ if(BuildMPEngine)
diff --git a/debian/patches/JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch b/debian/patches/JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch
new file mode 100644
index 0000000..e6e3b0d
--- /dev/null
+++ b/debian/patches/JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch
@@ -0,0 +1,33 @@
+From: Ensiform <ensiform at gmail.com>
+Date: Thu, 30 Apr 2015 09:02:20 -0500
+Subject: JK2: Remove cstdint usage from icarus/tokenizer.h.
+
+It doesn't seem to be necessary right now.
+Switched usage to `unsigned int` as it is in the JA MP version of the file.
+
+Refs #651 #658
+---
+ codeJK2/icarus/tokenizer.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/codeJK2/icarus/tokenizer.h b/codeJK2/icarus/tokenizer.h
+index 70e83de..aecb6ef 100644
+--- a/codeJK2/icarus/tokenizer.h
++++ b/codeJK2/icarus/tokenizer.h
+@@ -25,7 +25,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #ifndef __TOKENIZER_H
+ #define __TOKENIZER_H
+
+-#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -427,7 +426,7 @@ public:
+ void SetErrorProc(LPTokenizerErrorProc errorProc);
+ void AddParseStream(byte* data, long datasize);
+ bool AddParseFile(const char *filename);
+- uint32_t ParseRGB();
++ unsigned int ParseRGB();
+ long GetRemainingSize();
+
+ unsigned GetFlags();
diff --git a/debian/patches/JK2-icarus-include-string.h-for-strcmp-memcpy-in-inl.patch b/debian/patches/JK2-icarus-include-string.h-for-strcmp-memcpy-in-inl.patch
new file mode 100644
index 0000000..c764e86
--- /dev/null
+++ b/debian/patches/JK2-icarus-include-string.h-for-strcmp-memcpy-in-inl.patch
@@ -0,0 +1,37 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Thu, 30 Apr 2015 16:50:29 +0100
+Subject: JK2: icarus: #include <string.h> for strcmp,
+ memcpy in inline functions
+
+lessstr::operator() in tokenizer.h calls strcmp(), and
+CBlockMember::WriteDataPointer<T> calls memcpy(). These were presumably
+declared via some other header in older OpenJK or in older g++.
+---
+ codeJK2/icarus/blockstream.h | 1 +
+ codeJK2/icarus/tokenizer.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/codeJK2/icarus/blockstream.h b/codeJK2/icarus/blockstream.h
+index 18afb11..2cc3797 100644
+--- a/codeJK2/icarus/blockstream.h
++++ b/codeJK2/icarus/blockstream.h
+@@ -32,6 +32,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #ifdef _MSC_VER
+ #pragma warning (push, 3) //go back down to 3 for the stl include
+diff --git a/codeJK2/icarus/tokenizer.h b/codeJK2/icarus/tokenizer.h
+index aecb6ef..2556e08 100644
+--- a/codeJK2/icarus/tokenizer.h
++++ b/codeJK2/icarus/tokenizer.h
+@@ -26,6 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #define __TOKENIZER_H
+
+ #include <string>
++#include <string.h>
+ #include <vector>
+ #include <map>
+
diff --git a/debian/patches/JK2-icarus-tokenizer-include-cstring-for-strcmp-memc.patch b/debian/patches/JK2-icarus-tokenizer-include-cstring-for-strcmp-memc.patch
deleted file mode 100644
index ab54047..0000000
--- a/debian/patches/JK2-icarus-tokenizer-include-cstring-for-strcmp-memc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 27 Apr 2015 10:00:57 +0100
-Subject: JK2: icarus tokenizer: #include <cstring> for strcmp, memcpy
-
-Bug: https://github.com/JACoders/OpenJK/pull/658
----
- codeJK2/icarus/tokenizer.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/codeJK2/icarus/tokenizer.h b/codeJK2/icarus/tokenizer.h
-index 70e83de..cc8d5d7 100644
---- a/codeJK2/icarus/tokenizer.h
-+++ b/codeJK2/icarus/tokenizer.h
-@@ -26,6 +26,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
- #define __TOKENIZER_H
-
- #include <cstdint>
-+#include <cstring>
- #include <string>
- #include <vector>
- #include <map>
diff --git a/debian/patches/Fix-use-of-uninitialized-variable.patch b/debian/patches/MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
similarity index 82%
rename from debian/patches/Fix-use-of-uninitialized-variable.patch
rename to debian/patches/MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
index 4a27e30..7bdf6d5 100644
--- a/debian/patches/Fix-use-of-uninitialized-variable.patch
+++ b/debian/patches/MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
@@ -1,11 +1,10 @@
From: Simon McVittie <smcv at debian.org>
Date: Sun, 4 Jan 2015 00:05:34 +0000
-Subject: Fix use of uninitialized variable
+Subject: MP: PM_VehicleViewAngles: fix use of uninitialized variables
We shouldn't use clampMin or clampMax until they have been set,
-at which point setAngles becomes true.
-
-Forwarded: no
+at which point setAngles is set to true. Initializing it to true
+defeats that.
---
codemp/game/bg_pmove.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/SP-JK2-g_savegame-silence-compiler-warning.patch b/debian/patches/SP-JK2-g_savegame-silence-compiler-warning.patch
index 5753054..a6f0694 100644
--- a/debian/patches/SP-JK2-g_savegame-silence-compiler-warning.patch
+++ b/debian/patches/SP-JK2-g_savegame-silence-compiler-warning.patch
@@ -15,7 +15,7 @@ signed and unsigned integer expressions [-Wsign-compare]
iLen is a non-negative amount of memory, so size_t is a more
appropriate type than int.
-Bug: https://github.com/JACoders/OpenJK/pull/658
+Forwarded: https://github.com/JACoders/OpenJK/pull/658
---
code/game/g_savegame.cpp | 2 +-
codeJK2/game/g_savegame.cpp | 2 +-
diff --git a/debian/patches/Select-C-11-mode-when-compiling-with-g.patch b/debian/patches/Select-C-11-mode-when-compiling-with-g.patch
deleted file mode 100644
index 5e39de4..0000000
--- a/debian/patches/Select-C-11-mode-when-compiling-with-g.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 27 Apr 2015 09:24:25 +0100
-Subject: Select C++11 mode when compiling with g++
-
-This is required for <cstdint>, which is used by codeJK2 since
-commit 03235915.
-
-Bug: https://github.com/JACoders/OpenJK/pull/658
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0bd140b..8e8549d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -199,6 +199,8 @@ else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-+ # for <cstdint>
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
- if (Architecture STREQUAL "arm")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
- else()
diff --git a/debian/patches/Use-C-11-compliant-string-concatenation.patch b/debian/patches/Use-C-11-compliant-string-concatenation.patch
index 41c96c4..1e57ff5 100644
--- a/debian/patches/Use-C-11-compliant-string-concatenation.patch
+++ b/debian/patches/Use-C-11-compliant-string-concatenation.patch
@@ -6,7 +6,7 @@ C++11 reserves syntax like X"foo" and "foo"X for future syntax like
L"a wide-char string", so concatenating macros with literals now
requires an intervening space.
-Bug: https://github.com/JACoders/OpenJK/pull/658
+Forwarded: https://github.com/JACoders/OpenJK/pull/658
---
code/client/cl_keys.cpp | 4 ++--
code/qcommon/common.cpp | 10 +++++-----
@@ -49,10 +49,10 @@ index c694bd0..3e57df4 100644
}
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index b83dab5..e84a88a 100644
+index 6819199..e35e37a 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
-@@ -1654,7 +1654,7 @@ PrintMatches
+@@ -1636,7 +1636,7 @@ PrintMatches
*/
static void PrintMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -61,7 +61,7 @@ index b83dab5..e84a88a 100644
}
}
-@@ -1668,7 +1668,7 @@ PrintArgMatches
+@@ -1650,7 +1650,7 @@ PrintArgMatches
// This is here for if ever commands with other argument completion
static void PrintArgMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -70,7 +70,7 @@ index b83dab5..e84a88a 100644
}
}
#endif
-@@ -1681,7 +1681,7 @@ PrintKeyMatches
+@@ -1663,7 +1663,7 @@ PrintKeyMatches
*/
static void PrintKeyMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -79,7 +79,7 @@ index b83dab5..e84a88a 100644
}
}
-@@ -1693,7 +1693,7 @@ PrintFileMatches
+@@ -1675,7 +1675,7 @@ PrintFileMatches
*/
static void PrintFileMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -88,7 +88,7 @@ index b83dab5..e84a88a 100644
}
}
-@@ -1708,7 +1708,7 @@ static void PrintCvarMatches( const char *s ) {
+@@ -1690,7 +1690,7 @@ static void PrintCvarMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, (int)strlen( shortestMatch ) ) ) {
Com_TruncateLongString( value, Cvar_VariableString( s ) );
@@ -284,10 +284,10 @@ index e2b1ca4..64e4f87 100644
//if it's a bot just copy the info directly from its personality
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index 4b41207..4d5e577 100644
+index 742ad17..b1d83af 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
-@@ -1737,7 +1737,7 @@ PrintMatches
+@@ -1722,7 +1722,7 @@ PrintMatches
*/
static void PrintMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -296,7 +296,7 @@ index 4b41207..4d5e577 100644
}
}
-@@ -1751,7 +1751,7 @@ PrintArgMatches
+@@ -1736,7 +1736,7 @@ PrintArgMatches
// This is here for if ever commands with other argument completion
static void PrintArgMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -305,7 +305,7 @@ index 4b41207..4d5e577 100644
}
}
#endif
-@@ -1765,7 +1765,7 @@ PrintKeyMatches
+@@ -1750,7 +1750,7 @@ PrintKeyMatches
*/
static void PrintKeyMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -314,7 +314,7 @@ index 4b41207..4d5e577 100644
}
}
#endif
-@@ -1778,7 +1778,7 @@ PrintFileMatches
+@@ -1763,7 +1763,7 @@ PrintFileMatches
*/
static void PrintFileMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) {
@@ -323,7 +323,7 @@ index 4b41207..4d5e577 100644
}
}
-@@ -1793,7 +1793,7 @@ static void PrintCvarMatches( const char *s ) {
+@@ -1778,7 +1778,7 @@ static void PrintCvarMatches( const char *s ) {
if ( !Q_stricmpn( s, shortestMatch, (int)strlen( shortestMatch ) ) ) {
Com_TruncateLongString( value, Cvar_VariableString( s ) );
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 849b209..9bfb866 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 6819199..b83dab5 100644
+index e35e37a..e84a88a 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -48,7 +48,6 @@ cvar_t *com_speeds;
@@ -258,7 +258,7 @@ index c8abf18..37a012a 100644
- return false;
-}
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index 742ad17..4b41207 100644
+index b1d83af..4d5e577 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
@@ -43,9 +43,7 @@ cvar_t *com_developer;
diff --git a/debian/patches/codeJK2-replace-__cdecl-with-QDECL.patch b/debian/patches/codeJK2-replace-__cdecl-with-QDECL.patch
index 8ace593..7e47ac5 100644
--- a/debian/patches/codeJK2-replace-__cdecl-with-QDECL.patch
+++ b/debian/patches/codeJK2-replace-__cdecl-with-QDECL.patch
@@ -9,7 +9,7 @@ QDECL correctly expands to nothing.
Before commit 03235915, __cdecl expanded to nothing on non-Windows,
due to inclusion of ibize_platform.h.
-Bug: https://github.com/JACoders/OpenJK/pull/658
+Forwarded: https://github.com/JACoders/OpenJK/pull/658
---
codeJK2/cgame/cg_weapons.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 9b35041..96f5f7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
-g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
-Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
-Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
-Fix-use-of-uninitialized-variable.patch
-Select-C-11-mode-when-compiling-with-g.patch
+JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch
+MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
codeJK2-replace-__cdecl-with-QDECL.patch
Use-C-11-compliant-string-concatenation.patch
SP-JK2-g_savegame-silence-compiler-warning.patch
-JK2-icarus-tokenizer-include-cstring-for-strcmp-memc.patch
+JK2-icarus-include-string.h-for-strcmp-memcpy-in-inl.patch
+g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
+Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
+Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list