[openjk] 01/02: Mark most patches as forwarded
Simon McVittie
smcv at debian.org
Sun Sep 25 15:33:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit 7babc1774ff26c3cbd899a77024f896c5a06788b
Author: Simon McVittie <smcv at debian.org>
Date: Sun Sep 25 15:29:41 2016 +0100
Mark most patches as forwarded
---
...er-warning-when-sscanf-writes-qboolean-throug.patch | 2 ++
...form-independent-byteswapping-functions-QINLI.patch | 2 ++
...ix-a-typo-in-Siege-mode-attemtping-attempting.patch | 1 +
...from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch} | 18 +++++++++++++++++-
...compiler-warning-for-unused-BufferToHexString.patch | 2 ++
...hanism-to-say-no-servers-found-as-to-say-how-.patch | 2 ++
debian/patches/botlib-print-long-int-correctly.patch | 2 ++
debian/patches/series | 4 ++--
8 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch b/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
index 8eefb68..60fd760 100644
--- a/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
+++ b/debian/patches/Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
@@ -3,6 +3,8 @@ Date: Thu, 22 Sep 2016 08:29:35 +0100
Subject: Avoid compiler warning when sscanf writes qboolean through %i
.../code/game/g_client.cpp:760:6: warning: format '%i' expects argument of type 'int*', but argument 26 has type 'qboolean*' [-Wformat=]
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/872
---
code/game/g_client.cpp | 36 ++++++++++++++++++++----------------
code/game/g_session.cpp | 4 +++-
diff --git a/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch b/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch
index 1c522b0..9460ab6 100644
--- a/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch
+++ b/debian/patches/Declare-platform-independent-byteswapping-functions-QINLI.patch
@@ -9,6 +9,8 @@ In addition to enabling inlining for these very simple functions,
this suppresses warnings from gcc 6:
…/shared/qcommon/q_platform.h:302:13: warning: 'void CopyShortSwap(void*, const void*)' defined but not used [-Wunused-function]
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/869
---
shared/qcommon/q_platform.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch b/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
index f25a70d..3790824 100644
--- a/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
+++ b/debian/patches/Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
@@ -2,6 +2,7 @@ From: Simon McVittie <smcv at debian.org>
Date: Sun, 20 Mar 2016 13:47:36 +0000
Subject: Fix a typo in Siege mode: attemtping -> attempting
+Forwarded: https://github.com/JACoders/OpenJK/pull/868
---
codemp/game/ai_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
similarity index 89%
rename from debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
rename to debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index f6cc48e..6dcb238 100644
--- a/debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
+++ b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -1,7 +1,23 @@
From: Simon McVittie <smcv at debian.org>
Date: Sun, 20 Mar 2016 16:27:52 +0000
-Subject: Allow __DATE__ to be overridden, for reproducible builds
+Subject: Pick up date from SOURCE_DATE_EPOCH, for reproducible builds
+The goal of reproducible builds is that a rebuild of the same source
+code with the same compiler, libraries, etc. should result in the same
+binaries. SOURCE_DATE_EPOCH provides a standard way for build systems
+to fill in the date of the latest source change, typically from a git
+commit or from metadata like the debian/changelog in Debian packages.
+
+This does not change anything if SOURCE_DATE_EPOCH is not defined;
+the intention is that a larger build system like a Debian package
+will define it.
+
+Please see https://reproducible-builds.org/ for more information about
+reproducible builds.
+
+Similar to <https://github.com/ioquake/ioq3/pull/225>.
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/874
---
CMakeLists.txt | 9 +++++++++
code/game/g_main.cpp | 4 ++--
diff --git a/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch b/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch
index 74ac031..a22a930 100644
--- a/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch
+++ b/debian/patches/Suppress-compiler-warning-for-unused-BufferToHexString.patch
@@ -3,6 +3,8 @@ Date: Thu, 22 Sep 2016 08:43:34 +0100
Subject: Suppress compiler warning for unused BufferToHexString
This function is only called when debugging challenges.
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/873
---
codemp/server/sv_challenge.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch b/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch
index 44eaa48..eb80777 100644
--- a/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch
+++ b/debian/patches/Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch
@@ -7,6 +7,8 @@ This avoids an array underflow: if no servers were found, we would
write to foundPlayerServerNames[-1], which is undefined behaviour, but
with a reasonable assumption of the stack layout is likely to result
in a write to foundPlayerServerAddresses[MAX - 1].
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/870
---
codemp/ui/ui_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/botlib-print-long-int-correctly.patch b/debian/patches/botlib-print-long-int-correctly.patch
index 153cec7..36a133a 100644
--- a/debian/patches/botlib-print-long-int-correctly.patch
+++ b/debian/patches/botlib-print-long-int-correctly.patch
@@ -5,6 +5,8 @@ Subject: botlib: print long int correctly
value has type long, or equivalently signed long int. In C,
abs(some_long) returns int (to get a long result you would have to use
labs(some_long) due to lack of overloading), but in C++ it returns long.
+
+Forwarded: https://github.com/JACoders/OpenJK/pull/871
---
codemp/botlib/l_precomp.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 84851d2..4ca0236 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
Declare-platform-independent-byteswapping-functions-QINLI.patch
Avoid-compiler-warning-when-sscanf-writes-qboolean-throug.patch
botlib-print-long-int-correctly.patch
Use-same-mechanism-to-say-no-servers-found-as-to-say-how-.patch
Suppress-compiler-warning-for-unused-BufferToHexString.patch
-Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
+Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+g_utils-disarm-debug-code-that-writes-to-c-nofreeent.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