commit 26b108b2ed5559f401d0cf78385faf2973b4873b Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Aug 10 17:14:31 2023 +0100 Fix FTBFS gcc12.patch | 20 ++++++++++++++++++++ pcsx2.spec | 2 ++ wx-config-3.2.patch | 11 +++++++++++ 3 files changed, 33 insertions(+) --- diff --git a/gcc12.patch b/gcc12.patch new file mode 100644 index 0000000..b565c2a --- /dev/null +++ b/gcc12.patch @@ -0,0 +1,20 @@ +--- ./plugins/cdvdGigaherz/src/CDVD.h.orig 2023-08-10 16:16:20.716321111 +0100 ++++ ./plugins/cdvdGigaherz/src/CDVD.h 2023-08-10 16:16:25.011311080 +0100 +@@ -29,6 +29,7 @@ + #include <mutex> + #include <string> + #include <vector> ++#include <system_error> + + #define CDVDdefs + #include <PS2Edefs.h> +--- pcsx2-1.6.0/pcsx2/gui/i18n.cpp.orig 2023-08-10 16:37:17.172389358 +0100 ++++ pcsx2-1.6.0/pcsx2/gui/i18n.cpp 2023-08-10 16:37:30.484358330 +0100 +@@ -37,7 +37,6 @@ static wxString i18n_GetBetterLanguageNa + { + case wxLANGUAGE_CHINESE: return L"Chinese (Traditional)"; + case wxLANGUAGE_CHINESE_TRADITIONAL: return L"Chinese (Traditional)"; +- case wxLANGUAGE_CHINESE_TAIWAN: return L"Chinese (Traditional)"; + case wxLANGUAGE_CHINESE_HONGKONG: return L"Chinese (Traditional, Hong Kong)"; + case wxLANGUAGE_CHINESE_MACAU: return L"Chinese (Traditional, Macau)"; + } diff --git a/pcsx2.spec b/pcsx2.spec index 4351cbf..649cf31 100644 --- a/pcsx2.spec +++ b/pcsx2.spec @@ -10,6 +10,8 @@ Summary: Playstation 2 Emulator License: GPLv2 and GPLv3+ and LGPLv2+ and LGPLv3 URL: https://pcsx2.net Source0: https://github.com/%{appname}/%{name}/archive/v%{version}/%{name}-%{versi... +Patch1: wx-config-3.2.patch +Patch2: gcc12.patch ExclusiveArch: i686 BuildRequires: cmake3 diff --git a/wx-config-3.2.patch b/wx-config-3.2.patch new file mode 100644 index 0000000..151b86c --- /dev/null +++ b/wx-config-3.2.patch @@ -0,0 +1,11 @@ +--- ./cmake/SearchForStuff.cmake.orig 2023-08-10 14:28:49.578246639 +0100 ++++ ./cmake/SearchForStuff.cmake 2023-08-10 14:29:27.977160495 +0100 +@@ -35,7 +35,7 @@ else() + set(wxWidgets_CONFIG_OPTIONS --unicode=yes) + endif() + +-list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0) ++list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.2) + + if(GTK3_API AND NOT APPLE) + list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)