From d59d1215c3af461c868e9f43008e865f432a88b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 23 Jul 2023 12:20:43 +0200
Subject: [PATCH] openmw: update to 0.48.0.

---
 srcpkgs/openmw/patches/glibc-2.34.patch       | 36 -------------------
 .../openmw/patches/openmw-0.47.0-gcc12.patch  | 33 -----------------
 srcpkgs/openmw/template                       | 10 +++---
 3 files changed, 5 insertions(+), 74 deletions(-)
 delete mode 100644 srcpkgs/openmw/patches/glibc-2.34.patch
 delete mode 100644 srcpkgs/openmw/patches/openmw-0.47.0-gcc12.patch

diff --git a/srcpkgs/openmw/patches/glibc-2.34.patch b/srcpkgs/openmw/patches/glibc-2.34.patch
deleted file mode 100644
index 552f36ee1cb..00000000000
--- a/srcpkgs/openmw/patches/glibc-2.34.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Fri, 24 Sep 2021 19:40:29 +0200
-Subject: [PATCH] Assume SIGSTKSZ is not a constant
-
-SIGSTKSZ is not defined as constant since glibc 2.34:
-https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53
----
- components/crashcatcher/crashcatcher.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
-index 86571e1e3af..c828e1ca816 100644
---- a/components/crashcatcher/crashcatcher.cpp
-+++ b/components/crashcatcher/crashcatcher.cpp
-@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n";
- 
- static char argv0[PATH_MAX];
- 
--static char altstack[SIGSTKSZ];
--
- 
- static struct {
-     int signum;
-@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
- 
-     /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
-      * still run */
-+    static char* altstack = new char [SIGSTKSZ];
-     altss.ss_sp = altstack;
-     altss.ss_flags = 0;
--    altss.ss_size = sizeof(altstack);
-+    altss.ss_size = SIGSTKSZ;
-     sigaltstack(&altss, nullptr);
- 
-     memset(&sa, 0, sizeof(sa));
diff --git a/srcpkgs/openmw/patches/openmw-0.47.0-gcc12.patch b/srcpkgs/openmw/patches/openmw-0.47.0-gcc12.patch
deleted file mode 100644
index 4c04d7b25c7..00000000000
--- a/srcpkgs/openmw/patches/openmw-0.47.0-gcc12.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Backport missing includes causing issues with gcc12.
-https://bugs.gentoo.org/858725
-https://gitlab.com/OpenMW/openmw/-/commit/5f2e282359
-From: elsid <elsid.mail@gmail.com>
-Date: Tue, 17 May 2022 00:58:24 +0200
-Subject: [PATCH] Add includes for used types and functions
---- a/components/myguiplatform/myguidatamanager.cpp
-+++ b/components/myguiplatform/myguidatamanager.cpp
-@@ -1,8 +1,11 @@
- #include "myguidatamanager.hpp"
- 
-+#include <memory>
-+#include <string>
-+
- #include <MyGUI_DataFileStream.h>
- 
--#include <boost/filesystem.hpp>
-+#include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/fstream.hpp>
- 
- #include <components/debug/debuglog.hpp>
---- a/components/myguiplatform/myguidatamanager.hpp
-+++ b/components/myguiplatform/myguidatamanager.hpp
-@@ -3,6 +3,8 @@
- 
- #include <MyGUI_DataManager.h>
- 
-+#include <string>
-+
- namespace osgMyGUI
- {
- 
-GitLab
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index e3771c7aaf1..70a9ec64a4c 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
 # Template file for 'openmw'
 pkgname=openmw
-version=0.47.0
-revision=5
+version=0.48.0
+revision=1
 build_style=cmake
 _recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea
 _bullet_tag=3.17
@@ -12,16 +12,16 @@ configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="SDL2-devel boost-devel ffmpeg-devel libXt-devel
  libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel
- liblz4-devel"
+ liblz4-devel yaml-cpp-devel LuaJIT-devel"
 short_desc="Open Implementation of Morrowind's Engine"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://openmw.org"
-changelog="https://openmw.org/2021/openmw-0-47-0-released/"
+changelog="https://openmw.org/2023/openmw-0-48-0-released/"
 distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz
  https://github.com/recastnavigation/recastnavigation/archive/${_recast_commit}.tar.gz
  https://github.com/bulletphysics/bullet3/archive/refs/tags/${_bullet_tag}.tar.gz"
-checksum="bd7f77e1527c2180e9b0dfcbe401d6fb48f24dbb37701dac7747697873d6edb4
+checksum="ebcc1e217479306a92036aabf6f8225a3d228759eef6255cda57fb8566b9d388
  c647e307d6cc62ba00bfd888e82da83844bf1e72f2c98bed2f1d95bac229b950
  baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61"