From a0cb1617f65e0e9c9ea692b3f446232f3577d4d6 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Mon, 3 Dec 2018 08:36:44 +0100
Subject: [PATCH] EDuke32: bump version (#3436)

---
 ...94.recipe => eduke32-20181118_7241.recipe} |  2 +-
 ...atchset => eduke32-20181118_7241.patchset} | 43 ++++++++-----------
 2 files changed, 19 insertions(+), 26 deletions(-)
 rename games-fps/eduke32/{eduke32-20180224_6694.recipe => eduke32-20181118_7241.recipe} (97%)
 rename games-fps/eduke32/patches/{eduke32-20180224_6694.patchset => eduke32-20181118_7241.patchset} (78%)

diff --git a/games-fps/eduke32/eduke32-20180224_6694.recipe b/games-fps/eduke32/eduke32-20181118_7241.recipe
similarity index 97%
rename from games-fps/eduke32/eduke32-20180224_6694.recipe
rename to games-fps/eduke32/eduke32-20181118_7241.recipe
index 90eba4067..8cb79e73d 100644
--- a/games-fps/eduke32/eduke32-20180224_6694.recipe
+++ b/games-fps/eduke32/eduke32-20181118_7241.recipe
@@ -36,7 +36,7 @@ LICENSE="GNU GPL v2
 	Build_Engine"
 REVISION="1"
 SOURCE_URI="http://dukeworld.com/eduke32/synthesis/${portVersion/_/-}/eduke32_src_${portVersion/_/-}.tar.xz"
-CHECKSUM_SHA256="23bca589baa7937212ad058265811a70328b62353ee39c2028803279a7889070"
+CHECKSUM_SHA256="7c2dac1e540c7c39d24f08a3646a71b3290b74ea7e61abd61e6b6a0c5ec74f86"
 SOURCE_DIR="eduke32_${portVersion/_/-}"
 PATCHES="eduke32-$portVersion.patchset"
 
diff --git a/games-fps/eduke32/patches/eduke32-20180224_6694.patchset b/games-fps/eduke32/patches/eduke32-20181118_7241.patchset
similarity index 78%
rename from games-fps/eduke32/patches/eduke32-20180224_6694.patchset
rename to games-fps/eduke32/patches/eduke32-20181118_7241.patchset
index 436d753de..ba0a3b018 100644
--- a/games-fps/eduke32/patches/eduke32-20180224_6694.patchset
+++ b/games-fps/eduke32/patches/eduke32-20181118_7241.patchset
@@ -1,18 +1,11 @@
-From 68865ee289078b991e257621597ef93b17887a86 Mon Sep 17 00:00:00 2001
+From 30766ce45418158d4f477b4f8d28a9d3705e240e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 25 Feb 2018 11:10:26 +0100
-Subject: [PATCH] Haiku supporting patches
+Subject: Haiku supporting patches
 
----
- Common.mak                    | 20 ++++++++++++++------
- GNUmakefile                   |  4 ++++
- source/build/include/compat.h |  2 +-
- source/build/src/kplib.cpp    | 20 ++++++++++++--------
- source/duke3d/src/common.cpp  |  2 ++
- 5 files changed, 33 insertions(+), 15 deletions(-)
 
 diff --git a/Common.mak b/Common.mak
-index f101b27..11fa9a6 100644
+index d84272f..7fea56d 100644
 --- a/Common.mak
 +++ b/Common.mak
 @@ -33,6 +33,8 @@ ifndef HOSTPLATFORM
@@ -24,7 +17,7 @@ index f101b27..11fa9a6 100644
          else ifeq ($(findstring skyos,$(uname)),skyos)
              HOSTPLATFORM := SKYOS
          else ifeq ($(findstring QNX,$(uname)),QNX)
-@@ -957,17 +959,23 @@ else ifeq ($(SUBPLATFORM),LINUX)
+@@ -959,17 +961,23 @@ else ifeq ($(SUBPLATFORM),LINUX)
      LIBS += -lrt
  endif
  
@@ -55,10 +48,10 @@ index f101b27..11fa9a6 100644
  ##### Detect version control revision, if applicable
  
 diff --git a/GNUmakefile b/GNUmakefile
-index e250f9b..1de4006 100644
+index d9ef931..f66a874 100644
 --- a/GNUmakefile
 +++ b/GNUmakefile
-@@ -612,6 +612,10 @@ ifeq ($(PLATFORM),BSD)
+@@ -614,6 +614,10 @@ ifeq ($(PLATFORM),BSD)
      LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo
  endif
  
@@ -70,10 +63,10 @@ index e250f9b..1de4006 100644
      LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \
              -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
 diff --git a/source/build/include/compat.h b/source/build/include/compat.h
-index c0b8761..544fd64 100644
+index 38c479a..51e058c 100644
 --- a/source/build/include/compat.h
 +++ b/source/build/include/compat.h
-@@ -331,7 +331,7 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
+@@ -342,7 +342,7 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
  # endif
  # include <libkern/OSByteOrder.h>
  
@@ -83,7 +76,7 @@ index c0b8761..544fd64 100644
  # if LITTLE_ENDIAN != 0
  #  define B_LITTLE_ENDIAN 1
 diff --git a/source/build/src/kplib.cpp b/source/build/src/kplib.cpp
-index 601892d..c0c3e77 100644
+index 5ec453d..1c71477 100644
 --- a/source/build/src/kplib.cpp
 +++ b/source/build/src/kplib.cpp
 @@ -34,6 +34,10 @@ credits.
@@ -95,9 +88,9 @@ index 601892d..c0c3e77 100644
 +#endif
 +
  #if !defined(_WIN32)
- #include <dirent.h>
- static inline int32_t _lrotl(int32_t i, int sh) { return (i >> (-sh)) | (i << sh); }
-@@ -2759,14 +2763,14 @@ int32_t kzfindfile(char *filnam)
+ # include <dirent.h>
+ static FORCE_INLINE CONSTEXPR int32_t klrotl(int32_t i, int sh) { return (i >> (-sh)) | (i << sh); }
+@@ -2757,14 +2761,14 @@ int32_t kzfindfile(char *filnam)
              if ((findata = readdir(hfind)) == NULL)
                  { closedir(hfind); hfind = NULL; if (!kzhashbuf) return 0; srchstat = 2; break; }
              i = wildstpathleng;
@@ -121,18 +114,18 @@ index 601892d..c0c3e77 100644
              return 1;
          }
 diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp
-index 7ea47de..236d044 100644
+index 5dc0317..9240204 100644
 --- a/source/duke3d/src/common.cpp
 +++ b/source/duke3d/src/common.cpp
 @@ -320,6 +320,8 @@ void G_ExtInit(void)
-                       "EDuke32 Settings"
+                       APPNAME
  #elif defined(GEKKO)
-                       "apps/eduke32"
+                       "apps/" APPBASENAME
 +#elif defined(__HAIKU__)
-+                      "config/settings/eduke32"
++                      "config/settings/" APPBASENAME
  #else
-                       ".eduke32"
+                       ".config/" APPBASENAME
  #endif
 -- 
-2.16.2
+2.19.1