games-fps/duke3d: Adapt patches for future eapi6 bump
authorPacho Ramos <pacho@gentoo.org>
Tue, 1 May 2018 07:54:50 +0000 (09:54 +0200)
committerPacho Ramos <pacho@gentoo.org>
Tue, 1 May 2018 19:31:25 +0000 (21:31 +0200)
Package-Manager: Portage-2.3.31, Repoman-2.3.9

games-fps/duke3d/files/20040817-credits.patch
games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
games-fps/duke3d/files/20040817-endian.patch
games-fps/duke3d/files/duke3d-20040817-as-needed.patch
games-fps/duke3d/files/duke3d-20040817-gcc4.patch

index 176fcd74752b404cdb8ff83a066f9ec0df9617ed..19eefa4bf4235486a5f11f4ff827cad834d9bafa 100644 (file)
@@ -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:
index d23f7a118f779df0e195c3c8a24c3446912f7e4d..9ed2a005215336b0f7e0748caf248bae9ed206c0 100644 (file)
@@ -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
index a22d07fb09f189419d4f70a5a43593ed375cdf08..3bcdc1379db614e2cbcd9ad67e2ac3d52cf993f3 100644 (file)
@@ -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)
index 5eb90fea3e141dc664ee847726d11ebdd1a95d47..c7793a833bf907d30265f6a8ac7b674de93d6eb9 100644 (file)
@@ -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.)
index 2a37148d799caa77eeb4bd568169a1201ec7b63c..3aaf67c6c90b94e4917ce7d4c942f48e84091ea7 100644 (file)
@@ -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))