[yquake2] 06/11: Refresh patches
Fabian Greffrath
fabian at moszumanska.debian.org
Tue Sep 29 08:43:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
fabian pushed a commit to branch master
in repository yquake2.
commit 58e846270755afad38d9dc0268acfb73194e2a30
Author: Fabian Greffrath <fabian at debian.org>
Date: Tue Sep 29 10:08:06 2015 +0200
Refresh patches
---
.../Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch | 6 ------
.../Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch | 6 ++----
debian/patches/Fix-spelling-errors-detected-by-lintian.patch | 4 ----
debian/patches/Optionally-link-libopenal-at-compile-time.patch | 10 ++--------
4 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch b/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
index bb0460c..20824e4 100644
--- a/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
+++ b/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
@@ -8,8 +8,6 @@ Subject: Add BUILDDATE macro which overrides __DATE__, for reproducible builds
src/game/savegame/savegame.c | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
-diff --git a/src/common/header/common.h b/src/common/header/common.h
-index f4c930d..76d7e6a 100644
--- a/src/common/header/common.h
+++ b/src/common/header/common.h
@@ -63,6 +63,10 @@
@@ -23,8 +21,6 @@ index f4c930d..76d7e6a 100644
#ifdef _WIN32
#define CFGDIR "YamagiQ2"
#else
-diff --git a/src/common/misc.c b/src/common/misc.c
-index 61ebe06..f54d659 100644
--- a/src/common/misc.c
+++ b/src/common/misc.c
@@ -241,7 +241,7 @@ Qcommon_Init(int argc, char **argv)
@@ -36,8 +32,6 @@ index 61ebe06..f54d659 100644
Cvar_Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);
if (dedicated->value)
-diff --git a/src/game/savegame/savegame.c b/src/game/savegame/savegame.c
-index ce235e2..7456cec 100644
--- a/src/game/savegame/savegame.c
+++ b/src/game/savegame/savegame.c
@@ -217,7 +217,7 @@ InitGame(void)
diff --git a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
index 6d44235..3225929 100644
--- a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
+++ b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
@@ -11,8 +11,6 @@ but yquake2 doesn't.
Makefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
-diff --git a/Makefile b/Makefile
-index 2609513..9ce3d76 100755
--- a/Makefile
+++ b/Makefile
@@ -153,13 +153,14 @@ endif
@@ -23,13 +21,13 @@ index 2609513..9ce3d76 100755
ifeq ($(OSTYPE), Darwin)
-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
- -Wall -pipe -g
+ -Wall -pipe -g -fwrapv
#-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk
CFLAGS += $(OSX_ARCH)
else
-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
- -Wall -pipe -g -ggdb -MMD
+ -Wall -pipe -g -ggdb -MMD -fwrapv
endif
@@ -227,9 +228,9 @@ endif
diff --git a/debian/patches/Fix-spelling-errors-detected-by-lintian.patch b/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
index f9bd245..d64cd3f 100644
--- a/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
+++ b/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
@@ -7,8 +7,6 @@ Subject: Fix spelling-errors detected by lintian
src/game/savegame/savegame.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/src/backends/unix/signalhandler.c b/src/backends/unix/signalhandler.c
-index ec36e8d..afeef93 100644
--- a/src/backends/unix/signalhandler.c
+++ b/src/backends/unix/signalhandler.c
@@ -49,7 +49,7 @@ printBacktrace(int sig)
@@ -38,8 +36,6 @@ index ec36e8d..afeef93 100644
printf("\nThank you very much for your help, making Yamagi Quake\n");
printf("II an even better source port. It's much appreciated.\n");
printf("\n=======================================================\n\n");
-diff --git a/src/game/savegame/savegame.c b/src/game/savegame/savegame.c
-index 09ac8a8..ce235e2 100644
--- a/src/game/savegame/savegame.c
+++ b/src/game/savegame/savegame.c
@@ -835,18 +835,18 @@ ReadGame(const char *filename)
diff --git a/debian/patches/Optionally-link-libopenal-at-compile-time.patch b/debian/patches/Optionally-link-libopenal-at-compile-time.patch
index 403ecd0..05fdd7e 100644
--- a/debian/patches/Optionally-link-libopenal-at-compile-time.patch
+++ b/debian/patches/Optionally-link-libopenal-at-compile-time.patch
@@ -16,8 +16,6 @@ equivalent change was made upstream in version 5.20.
src/backends/unix/system.c | 16 +++-
3 files changed, 139 insertions(+), 102 deletions(-)
-diff --git a/Makefile b/Makefile
-index 9ce3d76..9863fa2 100755
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,12 @@ WITH_OGG:=yes
@@ -33,7 +31,7 @@ index 9ce3d76..9863fa2 100755
# Use SDL2 instead of SDL1.2. Disables CD audio support,
# because SDL2 has none. Use OGG/Vorbis music instead :-)
# On Windows sdl-config isn't used, so make sure that
-@@ -399,14 +405,19 @@ release/quake2 : LDFLAGS += -lvorbis -lvorbisfile -logg
+@@ -399,14 +405,19 @@ release/quake2 : LDFLAGS += -lvorbis -lv
endif
ifeq ($(WITH_OPENAL),yes)
@@ -57,8 +55,6 @@ index 9ce3d76..9863fa2 100755
ifeq ($(WITH_ZIP),yes)
release/quake2 : CFLAGS += -DZIP -DNOUNCRYPT
-diff --git a/src/backends/generic/qal.c b/src/backends/generic/qal.c
-index ae04ac2..b5cdef4 100644
--- a/src/backends/generic/qal.c
+++ b/src/backends/generic/qal.c
@@ -43,7 +43,9 @@
@@ -303,11 +299,9 @@ index ae04ac2..b5cdef4 100644
/* Open the OpenAL device */
Com_Printf("...opening OpenAL device:");
-diff --git a/src/backends/unix/system.c b/src/backends/unix/system.c
-index 79cb942..9617b28 100644
--- a/src/backends/unix/system.c
+++ b/src/backends/unix/system.c
-@@ -496,7 +496,21 @@ Sys_GetHomeDir(void)
+@@ -500,7 +500,21 @@ Sys_GetHomeDir(void)
void *
Sys_GetProcAddress(void *handle, const char *sym)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git
More information about the Pkg-games-commits
mailing list