summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2018-05-01 09:54:50 +0200
committerPacho Ramos <pacho@gentoo.org>2018-05-01 21:31:25 +0200
commitb15fba7116d30d99c4d96c56ea287177d2f934f7 (patch)
tree8b4d4d6503e480a26b641fc21181048f0e1bee65
parentdev-python/zope-interface: stable 4.4.3 for ia64, bug #654442 (diff)
downloadgentoo-b15fba7116d30d99c4d96c56ea287177d2f934f7.tar.gz
gentoo-b15fba7116d30d99c4d96c56ea287177d2f934f7.tar.bz2
gentoo-b15fba7116d30d99c4d96c56ea287177d2f934f7.zip
games-fps/duke3d: Adapt patches for future eapi6 bump
Package-Manager: Portage-2.3.31, Repoman-2.3.9
-rw-r--r--games-fps/duke3d/files/20040817-credits.patch4
-rw-r--r--games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch4
-rw-r--r--games-fps/duke3d/files/20040817-endian.patch4
-rw-r--r--games-fps/duke3d/files/duke3d-20040817-as-needed.patch8
-rw-r--r--games-fps/duke3d/files/duke3d-20040817-gcc4.patch12
5 files changed, 16 insertions, 16 deletions
diff --git a/games-fps/duke3d/files/20040817-credits.patch b/games-fps/duke3d/files/20040817-credits.patch
index 176fcd74752b..19eefa4bf423 100644
--- a/games-fps/duke3d/files/20040817-credits.patch
+++ b/games-fps/duke3d/files/20040817-credits.patch
@@ -1,5 +1,5 @@
---- menues.c 2003-08-17 22:16:10.000000000 +0200
-+++ menues.c 2004-03-29 01:59:28.000000000 +0200
+--- a/menues.c 2003-08-17 22:16:10.000000000 +0200
++++ b/menues.c 2004-03-29 01:59:28.000000000 +0200
@@ -1747,9 +1747,10 @@
case 996:
case 997:
diff --git a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
index d23f7a118f77..9ed2a0052153 100644
--- a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
+++ b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2003-08-17 17:45:35.948650760 -0400
-+++ Makefile 2003-08-17 17:46:36.894385600 -0400
+--- a/Makefile.orig 2003-08-17 17:45:35.948650760 -0400
++++ b/Makefile 2003-08-17 17:46:36.894385600 -0400
@@ -4,6 +4,8 @@
beos := false
macosx := false
diff --git a/games-fps/duke3d/files/20040817-endian.patch b/games-fps/duke3d/files/20040817-endian.patch
index a22d07fb09f1..3bcdc1379db6 100644
--- a/games-fps/duke3d/files/20040817-endian.patch
+++ b/games-fps/duke3d/files/20040817-endian.patch
@@ -1,5 +1,5 @@
---- duke3d/source/buildengine/platform.h 2003-08-07 12:06:17.000000000 +0200
-+++ duke3d.new/source/buildengine/platform.h 2004-08-24 18:35:05.292291088 +0200
+--- buildengine/platform.h.old 2003-08-07 12:06:17.000000000 +0200
++++ buildengine/platform.h 2004-08-24 18:35:05.292291088 +0200
@@ -5,6 +5,7 @@
#include "win32_compat.h"
#elif (defined PLATFORM_UNIX)
diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
index 5eb90fea3e14..c7793a833bf9 100644
--- a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
+++ b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
@@ -1,6 +1,6 @@
diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile
---- duke3d/source/buildengine/Makefile 2004-05-15 05:15:05.000000000 +0200
-+++ duke3d-patched/source/buildengine/Makefile 2008-02-27 23:10:46.000000000 +0100
+--- source/buildengine/Makefile 2004-05-15 05:15:05.000000000 +0200
++++ source/buildengine/Makefile 2008-02-27 23:10:46.000000000 +0100
@@ -99,11 +99,11 @@
ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
$(error Cygwin users need to set the SDL_LIB_DIR envr var.)
@@ -47,8 +47,8 @@ diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Ma
listclean:
@echo "A 'make clean' would remove" $(CLEANUP)
diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile
---- duke3d/source/Makefile 2004-05-15 05:14:16.000000000 +0200
-+++ duke3d-patched/source/Makefile 2008-02-27 23:09:57.000000000 +0100
+--- source/Makefile 2004-05-15 05:14:16.000000000 +0200
++++ source/Makefile 2008-02-27 23:09:57.000000000 +0100
@@ -45,11 +45,11 @@
ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
$(error Cygwin users need to set the SDL_LIB_DIR envr var.)
diff --git a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
index 2a37148d799c..3aaf67c6c90b 100644
--- a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
+++ b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
@@ -1,6 +1,6 @@
iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
---- duke3d/source/buildengine/a.c 2004-11-25 13:55:21.000000000 -0500
-+++ duke3d-gcc4/source/buildengine/a.c 2005-06-18 18:14:24.000000000 -0400
+--- source/buildengine/a.c 2004-11-25 13:55:21.000000000 -0500
++++ source/buildengine/a.c 2005-06-18 18:14:24.000000000 -0400
@@ -186,7 +186,9 @@
if (i3 == 0)
{
@@ -13,8 +13,8 @@ iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
*dest = ((unsigned char*)i2)[i4];
return i1;
diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/pragmas.c
---- duke3d/source/buildengine/pragmas.c 2003-07-25 20:11:32.000000000 -0400
-+++ duke3d-gcc4/source/buildengine/pragmas.c 2005-06-18 18:25:37.000000000 -0400
+--- source/buildengine/pragmas.c 2003-07-25 20:11:32.000000000 -0400
++++ source/buildengine/pragmas.c 2005-06-18 18:25:37.000000000 -0400
@@ -56,28 +56,39 @@
void clearbufbyte(void *buffer, int size, long fill_value) {
@@ -74,8 +74,8 @@ diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/prag
}
diff -u -r duke3d/source/buildengine/a.h duke3d.gcc4.1.1/source/buildengine/a.h
---- duke3d/source/buildengine/a.h 2003-04-11 08:54:06.000000000 +0200
-+++ duke3d.gcc4.1.1/source/buildengine/a.h 2006-06-22 12:14:40.366393568 +0200
+--- source/buildengine/a.h 2003-04-11 08:54:06.000000000 +0200
++++ source/buildengine/a.h 2006-06-22 12:14:40.366393568 +0200
@@ -116,56 +116,56 @@
#if ((defined __GNUC__) && (!defined C_IDENTIFIERS_UNDERSCORED))