diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
| commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
| tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /games-fps/yamagi-quake2/files | |
| parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) | |
gentoo resync : 28.04.2019
Diffstat (limited to 'games-fps/yamagi-quake2/files')
| -rw-r--r-- | games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch | 33 | ||||
| -rw-r--r-- | games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch | 17 |
2 files changed, 33 insertions, 17 deletions
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch new file mode 100644 index 000000000000..bb800aeaf3c9 --- /dev/null +++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch @@ -0,0 +1,33 @@ +--- quake2-xatrix-2.06.orig/Makefile 2019-02-05 10:56:06.000000000 +0300 ++++ quake2-xatrix-2.06/Makefile 2019-04-08 01:24:04.124176498 +0300 +@@ -75,11 +75,11 @@ + # + # -MMD to generate header dependencies. + ifeq ($(OSTYPE), Darwin) +-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +- -Wall -pipe -g -fwrapv -arch i386 -arch x86_64 ++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \ ++ -Wall -fwrapv -arch i386 -arch x86_64 + else +-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +- -Wall -pipe -g -MMD -fwrapv ++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \ ++ -Wall -MMD -fwrapv + endif + + # ---------- +@@ -107,11 +107,11 @@ + + # Base LDFLAGS. + ifeq ($(OSTYPE), Darwin) +-LDFLAGS := -shared -arch i386 -arch x86_64 ++LDFLAGS += -shared -arch i386 -arch x86_64 + else ifeq ($(OSTYPE), Windows) +-LDFLAGS := -shared -static-libgcc ++LDFLAGS += -shared -static-libgcc + else +-LDFLAGS := -shared ++LDFLAGS += -shared + endif + + # ---------- diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch deleted file mode 100644 index 1de79c986907..000000000000 --- a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/383179 - -Upstream removed OF macro definition: -https://github.com/yquake2/yquake2/commit/716d72a295c9247b3c88ccd180bb7a517ed99e13 - ---- a/src/common/unzip/ioapi.h 2018-03-10 20:24:21.000000000 +0300 -+++ b/src/common/unzip/ioapi.h 2018-04-10 00:34:08.688675097 +0300 -@@ -120,6 +120,9 @@ - #define ZLIB_FILEFUNC_MODE_EXISTING (4) - #define ZLIB_FILEFUNC_MODE_CREATE (8) - -+#ifdef _Z_OF -+#define OF _Z_OF -+#endif - - #ifndef ZCALLBACK - #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) |