From e7bc5cacb1abeb6806d255e2a817ab4dcb5f52b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Sep 2023 04:32:23 +0100 Subject: gentoo auto-resync : 09:09:2023 - 04:32:23 --- .../openmw/files/openmw-0.47.0-gcc12.patch | 33 ----------------- .../openmw/files/openmw-0.47.0-gcc13.patch | 22 ------------ .../openmw/files/openmw-0.47.0-mygui-license.patch | 16 --------- .../openmw/files/openmw-0.47.0-sigstksz.patch | 42 ---------------------- 4 files changed, 113 deletions(-) delete mode 100644 games-engines/openmw/files/openmw-0.47.0-gcc12.patch delete mode 100644 games-engines/openmw/files/openmw-0.47.0-gcc13.patch delete mode 100644 games-engines/openmw/files/openmw-0.47.0-mygui-license.patch delete mode 100644 games-engines/openmw/files/openmw-0.47.0-sigstksz.patch (limited to 'games-engines/openmw/files') diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc12.patch b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch deleted file mode 100644 index 4c04d7b25c78..000000000000 --- a/games-engines/openmw/files/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 -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 -+#include -+ - #include - --#include -+#include - #include - - #include ---- a/components/myguiplatform/myguidatamanager.hpp -+++ b/components/myguiplatform/myguidatamanager.hpp -@@ -3,6 +3,8 @@ - - #include - -+#include -+ - namespace osgMyGUI - { - -GitLab diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc13.patch b/games-engines/openmw/files/openmw-0.47.0-gcc13.patch deleted file mode 100644 index bb99b7c77880..000000000000 --- a/games-engines/openmw/files/openmw-0.47.0-gcc13.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix missing includes causing issues with gcc13. -https://bugs.gentoo.org/905337 ---- a/apps/openmw/mwinput/controlswitch.hpp -+++ b/apps/openmw/mwinput/controlswitch.hpp -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - namespace ESM - { ---- a/components/misc/utf8stream.hpp -+++ b/components/misc/utf8stream.hpp -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - class Utf8Stream - { diff --git a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch deleted file mode 100644 index 3bf5915bb65d..000000000000 --- a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch +++ /dev/null @@ -1,16 +0,0 @@ -We don't install license files - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d69352c94..5f97c86e9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -856,9 +856,6 @@ elseif(NOT APPLE) - INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-wizard" DESTINATION "${BINDIR}" ) - ENDIF(BUILD_WIZARD) - -- # Install licenses -- INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" ) -- - # Install icon and desktop file - INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw") - INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw") diff --git a/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch b/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch deleted file mode 100644 index 588d6d639726..000000000000 --- a/games-engines/openmw/files/openmw-0.47.0-sigstksz.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001 -From: elsid -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 - -Upstream-Status: Submitted -[https://gitlab.com/OpenMW/openmw/-/merge_requests/1239] ---- - 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 86571e1e3a..c828e1ca81 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)); --- -GitLab - -- cgit v1.2.3