gzdoom-4.10.0-3

3 files changed, 69 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6ffc6392c42..933a91493efd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gzdoom
 	pkgdesc = Feature centric port for all Doom engine games
 	pkgver = 4.10.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.zdoom.org/
 	arch = i686
 	arch = x86_64
@@ -41,9 +41,11 @@ pkgbase = gzdoom
 	source = gzdoom::git+https://github.com/coelckers/gzdoom.git#tag=g4.10.0
 	source = gzdoom.desktop
 	source = 0001-Fix-file-paths.patch
+	source = 0002-build-resolve-missing-includes-under-gcc-13.patch
 	sha256sums = SKIP
 	sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
 	sha256sums = a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f
+	sha256sums = a5b1db9ddef99234db138bca534c13a769e25f5dd85e37b3604108a62a35c46e
 	optdepends_x86_64 = vulkan-driver: Vulkan renderer
 	optdepends_x86_64 = vulkan-icd-loader: Vulkan renderer
 
diff --git a/0002-build-resolve-missing-includes-under-gcc-13.patch b/0002-build-resolve-missing-includes-under-gcc-13.patch
new file mode 100644
index 000000000000..4083e06f801a
--- /dev/null
+++ b/0002-build-resolve-missing-includes-under-gcc-13.patch
@@ -0,0 +1,60 @@
+From ee8c12eac62349f4524229370da20915624485ef Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 30 Mar 2023 23:41:22 +0200
+Subject: [PATCH] build: resolve missing includes under gcc-13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+$ make
+...
+~/gzdoom/libraries/ZVulkan/src/vulkanbuilders.cpp: In member function ‘std::unique_ptr<VulkanShader> ShaderBuilder::Create(const char*, VulkanDevice*)’:
+~/gzdoom/libraries/ZVulkan/src/vulkanbuilders.cpp:168:28: error: ‘runtime_error’ is not a member of ‘std’
+~/gzdoom/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h: In function ‘void VmaUint32ToStr(char*, size_t, uint32_t)’:
+~/gzdoom/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h:2410:9: error: ‘snprint ’ was not declared in this scope
+---
+ src/common/rendering/vulkan/system/vk_builders.cpp              | 1 +
+ src/common/rendering/vulkan/system/vk_swapchain.cpp             | 1 +
+ .../rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h     | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/common/rendering/vulkan/system/vk_builders.cpp b/src/common/rendering/vulkan/system/vk_builders.cpp
+index aff0de50a9..b8d4a13de9 100644
+--- a/src/common/rendering/vulkan/system/vk_builders.cpp
++++ b/src/common/rendering/vulkan/system/vk_builders.cpp
+@@ -20,6 +20,7 @@
+ **
+ */
+ 
++#include <stdexcept>
+ #include "vk_builders.h"
+ #include "engineerrors.h"
+ #include "renderstyle.h"
+diff --git a/src/common/rendering/vulkan/system/vk_swapchain.cpp b/src/common/rendering/vulkan/system/vk_swapchain.cpp
+index f44139b1f5..e89a6bd823 100644
+--- a/src/common/rendering/vulkan/system/vk_swapchain.cpp
++++ b/src/common/rendering/vulkan/system/vk_swapchain.cpp
+@@ -20,6 +20,7 @@
+ **
+ */
+ 
++#include <stdexcept>
+ #include "vk_swapchain.h"
+ #include "vk_objects.h"
+ #include "c_cvars.h"
+diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+index fd4472286b..db0b94f4e8 100644
+--- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
++++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+@@ -104,6 +104,8 @@ Documentation of all members: vk_mem_alloc.h
+ - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
+ */
+ 
++#include <stdio.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-- 
+2.40.1
+
diff --git a/PKGBUILD b/PKGBUILD
index fc541a03ebfe..d7fdf22aefca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gzdoom
 pkgver=4.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Feature centric port for all Doom engine games'
 arch=('i686' 'x86_64' 'aarch64')
 url='http://www.zdoom.org/'
@@ -38,14 +38,17 @@ replaces=('gzdoom1' 'gzdoom-legacy')
 options=(!lto)
 source=("gzdoom::git+https://github.com/coelckers/gzdoom.git#tag=g${pkgver}"
         'gzdoom.desktop'
-        '0001-Fix-file-paths.patch')
+        '0001-Fix-file-paths.patch'
+        '0002-build-resolve-missing-includes-under-gcc-13.patch')
 sha256sums=('SKIP'
             '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
-            'a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f')
+            'a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f'
+            'a5b1db9ddef99234db138bca534c13a769e25f5dd85e37b3604108a62a35c46e')
 
 prepare() {
     cd gzdoom
     patch -i "$srcdir"/0001-Fix-file-paths.patch -p 1
+    patch -i "$srcdir"/0002-build-resolve-missing-includes-under-gcc-13.patch -p 1
 }
 
 build() {