From 55cf3a5a840747b740a50d1ed8b6fb56d80b1c06 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:13:05 -0500 Subject: [PATCH 01/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 4c5beaa..0982198 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -64,6 +64,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Dec 12 2013 Jan Synáček - 3.1.1-1 - Update to 3.1.1 (#1040915) From 86bfec499b9abd082d2dfd5e4530163113056796 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 08:17:57 +0000 Subject: [PATCH 02/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 0982198..dcf243b 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -64,6 +64,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 989d19a4abb1b8466a0381dcc0762c8263ff07e8 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 5 Jan 2015 12:03:40 +0100 Subject: [PATCH 03/82] Update to 3.1.2 (#1178445) --- .gitignore | 1 + sources | 2 +- warzone2100.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2b49501..6957427 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1_rc3.tar.xz /warzone2100-3.1.0.tar.xz /warzone2100-3.1.1.tar.xz +/warzone2100-3.1.2.tar.xz diff --git a/sources b/sources index 1ee5057..bd43a29 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0b81a0012098a1310f5351a3ace2021b warzone2100-3.1.1.tar.xz +4e947125e9604821164f1ad9d1922447 warzone2100-3.1.2.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz diff --git a/warzone2100.spec b/warzone2100.spec index dcf243b..0b73bbc 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 -Version: 3.1.1 -Release: 3%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -64,6 +64,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon Jan 5 2015 Jan Synáček - 3.1.2-1 +- Update to 3.1.2 (#1178445) + * Mon Aug 18 2014 Fedora Release Engineering - 3.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 377bc6177234c01d7a3d5e185f827731e1e78da1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:46:00 +0000 Subject: [PATCH 04/82] Add an AppData file for the software center --- warzone2100.spec | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 0b73bbc..c90e256 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -49,12 +49,54 @@ desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + warzone2100.desktop + CC0-1.0 + Strategy war game + +

+ Warzone 2100 is a strategy war game with a nuclear post-apocalyptic scenario. + You can play the campaign or against your friends, parents and relatives + in multiplayer mode. +

+

+ Command your forces to crush your enemies and to restore the world. +

+

+ The game offers alot of addons that can be downloaded on the main website. +

+ + http://wz2100.net/ + + http://static.giantbomb.com/uploads/original/0/7192/428661-000023.jpg + http://www.download26.com/modules/wfdownloads/images/screenshots/warzonescreenshot.png + http://media.moddb.com/images/downloads/1/10/9762/screen11.jpg + + +EOF + %find_lang %{name} install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %files -f %{name}.lang %{_bindir}/%{name} %{_datadir}/icons/warzone* +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name} %exclude %{_datadir}/%{name}/sequences.wz @@ -64,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Mar 26 2015 Richard Hughes - 3.1.2-2 +- Add an AppData file for the software center + * Mon Jan 5 2015 Jan Synáček - 3.1.2-1 - Update to 3.1.2 (#1178445) From c08b2599020febbdddb3e443b35dadaaf6fcda44 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:34:21 +0200 Subject: [PATCH 05/82] Rebuilt for GCC 5 C++11 ABI change --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c90e256..08a633f 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -106,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sat May 02 2015 Kalev Lember - 3.1.2-3 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 26 2015 Richard Hughes - 3.1.2-2 - Add an AppData file for the software center From 9c3a2ccc2dfa4e87eafdb341d847f25904b5f5a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:15:37 +0000 Subject: [PATCH 06/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 08a633f..41f9a50 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -106,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 3.1.2-3 - Rebuilt for GCC 5 C++11 ABI change From df1db759b325468c02f33bd80024d1cbfad817f8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 14 Jan 2016 13:11:04 -0500 Subject: [PATCH 07/82] Rebuild for glew 1.13 --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 41f9a50..200d1f7 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -106,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Jan 14 2016 Adam Jackson - 3.1.2-5 +- Rebuild for glew 1.13 + * Fri Jun 19 2015 Fedora Release Engineering - 3.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 2fef842d470b9174535f3550515fb072b1778318 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 14 Jan 2016 15:53:56 -0500 Subject: [PATCH 08/82] Add patch to silence a stupid compiler error --- warzone2100-cast-me-harder.patch | 16 ++++++++++++++++ warzone2100.spec | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 warzone2100-cast-me-harder.patch diff --git a/warzone2100-cast-me-harder.patch b/warzone2100-cast-me-harder.patch new file mode 100644 index 0000000..e5d4ac1 --- /dev/null +++ b/warzone2100-cast-me-harder.patch @@ -0,0 +1,16 @@ +screen.cpp:264:22: error: invalid conversion from 'PFNGLSHADERSOURCEARBPROC {aka void (*)(unsigned int, int, const char**, const int*)}' to 'PFNGLSHADERSOURCEPROC {aka void (*)(unsigned int, int, const char* const*, const int*)}' [-fpermissive] + +Just... just shut up. + +diff -up warzone2100-3.1.2/lib/ivis_opengl/screen.cpp.jx warzone2100-3.1.2/lib/ivis_opengl/screen.cpp +--- warzone2100-3.1.2/lib/ivis_opengl/screen.cpp.jx 2013-12-11 21:20:34.000000000 -0500 ++++ warzone2100-3.1.2/lib/ivis_opengl/screen.cpp 2016-01-14 15:47:58.679938438 -0500 +@@ -261,7 +261,7 @@ void screen_EnableMissingFunctions() + __glewUseProgram = __glewUseProgramObjectARB; + __glewGetShaderiv = __glewGetObjectParameterivARB; + __glewLinkProgram = __glewLinkProgramARB; +- __glewShaderSource = __glewShaderSourceARB; ++ __glewShaderSource = (PFNGLSHADERSOURCEPROC)__glewShaderSourceARB; + __glewUniform1f = __glewUniform1fARB; + __glewUniform1i = __glewUniform1iARB; + __glewUniform4fv = __glewUniform4fvARB; diff --git a/warzone2100.spec b/warzone2100.spec index 200d1f7..3f6cfac 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -18,6 +18,8 @@ BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils +Patch0: warzone2100-cast-me-harder.patch + %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and most will agree it didn't enjoy the commercial success it should have had. The @@ -37,6 +39,7 @@ Video file for %{name} %prep %setup -q +%patch0 -p1 %build %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" From 588b68e58ab4e9131dcb41221db1951b13cedc1d Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 26 Jan 2016 09:42:35 +0100 Subject: [PATCH 09/82] Update to 3.1.3 (#1301801) --- .gitignore | 1 + sources | 2 +- warzone2100-cast-me-harder.patch | 16 ---------------- warzone2100.spec | 10 +++++----- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 warzone2100-cast-me-harder.patch diff --git a/.gitignore b/.gitignore index 6957427..d70c0ac 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1.0.tar.xz /warzone2100-3.1.1.tar.xz /warzone2100-3.1.2.tar.xz +/warzone2100-3.1.3.tar.xz diff --git a/sources b/sources index bd43a29..aee1654 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4e947125e9604821164f1ad9d1922447 warzone2100-3.1.2.tar.xz +0363cb43f037a5eadab7595bb1ab06e3 warzone2100-3.1.3.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz diff --git a/warzone2100-cast-me-harder.patch b/warzone2100-cast-me-harder.patch deleted file mode 100644 index e5d4ac1..0000000 --- a/warzone2100-cast-me-harder.patch +++ /dev/null @@ -1,16 +0,0 @@ -screen.cpp:264:22: error: invalid conversion from 'PFNGLSHADERSOURCEARBPROC {aka void (*)(unsigned int, int, const char**, const int*)}' to 'PFNGLSHADERSOURCEPROC {aka void (*)(unsigned int, int, const char* const*, const int*)}' [-fpermissive] - -Just... just shut up. - -diff -up warzone2100-3.1.2/lib/ivis_opengl/screen.cpp.jx warzone2100-3.1.2/lib/ivis_opengl/screen.cpp ---- warzone2100-3.1.2/lib/ivis_opengl/screen.cpp.jx 2013-12-11 21:20:34.000000000 -0500 -+++ warzone2100-3.1.2/lib/ivis_opengl/screen.cpp 2016-01-14 15:47:58.679938438 -0500 -@@ -261,7 +261,7 @@ void screen_EnableMissingFunctions() - __glewUseProgram = __glewUseProgramObjectARB; - __glewGetShaderiv = __glewGetObjectParameterivARB; - __glewLinkProgram = __glewLinkProgramARB; -- __glewShaderSource = __glewShaderSourceARB; -+ __glewShaderSource = (PFNGLSHADERSOURCEPROC)__glewShaderSourceARB; - __glewUniform1f = __glewUniform1fARB; - __glewUniform1i = __glewUniform1iARB; - __glewUniform4fv = __glewUniform4fvARB; diff --git a/warzone2100.spec b/warzone2100.spec index 3f6cfac..5c06f69 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 -Version: 3.1.2 -Release: 5%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -18,8 +18,6 @@ BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils -Patch0: warzone2100-cast-me-harder.patch - %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and most will agree it didn't enjoy the commercial success it should have had. The @@ -39,7 +37,6 @@ Video file for %{name} %prep %setup -q -%patch0 -p1 %build %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" @@ -109,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Jan 26 2016 Jan Synáček - 3.1.3-1 +- Update to 3.1.3 (#1301801) + * Thu Jan 14 2016 Adam Jackson - 3.1.2-5 - Rebuild for glew 1.13 From d06f4e1caf10e1692ba5cf27edbb4ed737f28ce4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:54:10 +0000 Subject: [PATCH 10/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 5c06f69..a07458f 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -106,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 26 2016 Jan Synáček - 3.1.3-1 - Update to 3.1.3 (#1301801) From d7b9aa8de60a83f4c9a1d65da8a51b64e03bb20a Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 5 Apr 2016 09:26:59 +0200 Subject: [PATCH 11/82] Update to 3.1.4 (#1323678) Resolves: #1323678 --- .gitignore | 1 + sources | 2 +- warzone2100.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d70c0ac..f66fbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1.1.tar.xz /warzone2100-3.1.2.tar.xz /warzone2100-3.1.3.tar.xz +/warzone2100-3.1.4.tar.xz diff --git a/sources b/sources index aee1654..b701116 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0363cb43f037a5eadab7595bb1ab06e3 warzone2100-3.1.3.tar.xz +67b4b3d57c84f316c283eedd5fa5e77f warzone2100-3.1.4.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz diff --git a/warzone2100.spec b/warzone2100.spec index a07458f..1990f61 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 -Version: 3.1.3 -Release: 2%{?dist} +Version: 3.1.4 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -106,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Apr 5 2016 Jan Synáček - 3.1.4-1 +- Update to 3.1.4 (#1323678) + * Fri Feb 05 2016 Fedora Release Engineering - 3.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 2c3a6eb288cba93306e2c5ff895ab583c579d54c Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 12 Apr 2016 09:42:41 +0200 Subject: [PATCH 12/82] Update to 3.1.5 (#1325926) Resolves: #1325926 --- .gitignore | 1 + sources | 2 +- warzone2100.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f66fbd8..3f1c137 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1.2.tar.xz /warzone2100-3.1.3.tar.xz /warzone2100-3.1.4.tar.xz +/warzone2100-3.1.5.tar.xz diff --git a/sources b/sources index b701116..a0a8784 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -67b4b3d57c84f316c283eedd5fa5e77f warzone2100-3.1.4.tar.xz +900b5df5c96b936241e2efcc8251137b warzone2100-3.1.5.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz diff --git a/warzone2100.spec b/warzone2100.spec index 1990f61..d0a30c4 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,5 +1,5 @@ Name: warzone2100 -Version: 3.1.4 +Version: 3.1.5 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -106,6 +106,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Apr 12 2016 Jan Synáček - 3.1.5-1 +- Update to 3.1.5 (#1325926) + * Tue Apr 5 2016 Jan Synáček - 3.1.4-1 - Update to 3.1.4 (#1323678) From d5e72020e215a749ca1c49cdbbbf46925d3206ef Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 12 Jul 2016 13:57:14 +0200 Subject: [PATCH 13/82] Update to 3.2.0 (#1354227) Resolves: #1354227 --- warzone2100-ssprintf.patch | 13 +++++++++++++ warzone2100.spec | 15 +++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 warzone2100-ssprintf.patch diff --git a/warzone2100-ssprintf.patch b/warzone2100-ssprintf.patch new file mode 100644 index 0000000..d7de0a3 --- /dev/null +++ b/warzone2100-ssprintf.patch @@ -0,0 +1,13 @@ +Make g++ happy. + +--- a/src/frontend.cpp 2016-07-10 19:36:14.000000000 +0200 ++++ b/src/frontend.cpp 2016-07-12 13:32:08.154269378 +0200 +@@ -378,7 +378,7 @@ static void startCampaignSelector() + QList list = readCampaignFiles(); + for (int i = 0; i < list.size(); i++) + { +- ssprintf(hackList[i], list[i].name.toUtf8().constData()); // since widget system is crazy and takes pointers not copies ++ ssprintf(hackList[i], "%s", list[i].name.toUtf8().constData()); // since widget system is crazy and takes pointers not copies + addTextButton(FRONTEND_CAMPAIGN_1 + i, FRONTEND_POS1X, FRONTEND_POS2Y + 40 * i, hackList[i], WBUT_TXTCENTRE); + } + addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("CAMPAIGNS")); diff --git a/warzone2100.spec b/warzone2100.spec index d0a30c4..f867df5 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,5 +1,5 @@ Name: warzone2100 -Version: 3.1.5 +Version: 3.2.0 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -9,14 +9,17 @@ URL: http://wz2100.net/ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz +Patch0: warzone2100-ssprintf.patch + BuildRequires: physfs-devel >= 2.0 -BuildRequires: qt-devel >= 4.0 +BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel BuildRequires: glew-devel >= 1.5.2 -BuildRequires: SDL_net-devel openal-soft-devel bison flex zip -BuildRequires: libpng-devel libogg-devel libvorbis-devel +BuildRequires: SDL2_net-devel openal-soft-devel bison flex zip +BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils +BuildRequires: openssl-devel %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and @@ -37,6 +40,7 @@ Video file for %{name} %prep %setup -q +%patch0 -p1 %build %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" @@ -106,6 +110,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Jul 12 2016 Jan Synáček - 3.2.0-1 +- Update to 3.2.0 (#1354227) + * Tue Apr 12 2016 Jan Synáček - 3.1.5-1 - Update to 3.1.5 (#1325926) From e74373a7366bc236da458f86314569b4412709c6 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Tue, 12 Jul 2016 15:34:34 +0200 Subject: [PATCH 14/82] add sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3f1c137..a11b9de 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1.3.tar.xz /warzone2100-3.1.4.tar.xz /warzone2100-3.1.5.tar.xz +/warzone2100-3.2.0.tar.xz diff --git a/sources b/sources index a0a8784..6e2f700 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -900b5df5c96b936241e2efcc8251137b warzone2100-3.1.5.tar.xz +fa185bfcd3c704889f56d218080d62fc warzone2100-3.2.0.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz From 28244393299c3ac53988da1f5bcb1598759e61e7 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Fri, 29 Jul 2016 13:15:46 +0200 Subject: [PATCH 15/82] Update to 3.2.1 (#1361438) Resolves: #1361438 --- .gitignore | 1 + sources | 2 +- warzone2100-ssprintf.patch | 13 ---------- warzone2100.appdata.xml | 23 +++++++++++++++++ warzone2100.spec | 52 +++++--------------------------------- 5 files changed, 32 insertions(+), 59 deletions(-) delete mode 100644 warzone2100-ssprintf.patch create mode 100644 warzone2100.appdata.xml diff --git a/.gitignore b/.gitignore index a11b9de..bd91e46 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1.4.tar.xz /warzone2100-3.1.5.tar.xz /warzone2100-3.2.0.tar.xz +/warzone2100-3.2.1.tar.xz diff --git a/sources b/sources index 6e2f700..42ec98f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fa185bfcd3c704889f56d218080d62fc warzone2100-3.2.0.tar.xz +1a329156387b3acfee56c7bd86fd606b warzone2100-3.2.1.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz diff --git a/warzone2100-ssprintf.patch b/warzone2100-ssprintf.patch deleted file mode 100644 index d7de0a3..0000000 --- a/warzone2100-ssprintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make g++ happy. - ---- a/src/frontend.cpp 2016-07-10 19:36:14.000000000 +0200 -+++ b/src/frontend.cpp 2016-07-12 13:32:08.154269378 +0200 -@@ -378,7 +378,7 @@ static void startCampaignSelector() - QList list = readCampaignFiles(); - for (int i = 0; i < list.size(); i++) - { -- ssprintf(hackList[i], list[i].name.toUtf8().constData()); // since widget system is crazy and takes pointers not copies -+ ssprintf(hackList[i], "%s", list[i].name.toUtf8().constData()); // since widget system is crazy and takes pointers not copies - addTextButton(FRONTEND_CAMPAIGN_1 + i, FRONTEND_POS1X, FRONTEND_POS2Y + 40 * i, hackList[i], WBUT_TXTCENTRE); - } - addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("CAMPAIGNS")); diff --git a/warzone2100.appdata.xml b/warzone2100.appdata.xml new file mode 100644 index 0000000..b1842bb --- /dev/null +++ b/warzone2100.appdata.xml @@ -0,0 +1,23 @@ + + + warzone2100.desktop + CC0-1.0 + GPL-2.0+ + Real-Time-Strategy War Game + Warzone 2100 + +

+ In Warzone 2100, you command the forces of The Project in a battle to rebuild the world after mankind has almost been destroyed by nuclear missiles. +

+

+ The game offers campaign, multi-player, and single-player skirmish modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics. +

+

+ Warzone 2100 was originally developed as a commercial game by Pumpkin Studios and published in 1999, and was released as open source by them in 2004, for the community to continue working on it. +

+ + https://wz2100.net/ + + https://wz2100.net/static/img/wz2100-CAM_3A50.png + + diff --git a/warzone2100.spec b/warzone2100.spec index f867df5..b6bc3ff 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,5 +1,5 @@ Name: warzone2100 -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -8,8 +8,8 @@ License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz - -Patch0: warzone2100-ssprintf.patch +# Upstream appdata. Currently missing from the archive (v3.2.1). Remove when the upstream tarball is fixed. +Source2: warzone2100.appdata.xml BuildRequires: physfs-devel >= 2.0 BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel @@ -40,7 +40,7 @@ Video file for %{name} %prep %setup -q -%patch0 -p1 +cp %{SOURCE2} icons/ %build %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" @@ -53,47 +53,6 @@ desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - warzone2100.desktop - CC0-1.0 - Strategy war game - -

- Warzone 2100 is a strategy war game with a nuclear post-apocalyptic scenario. - You can play the campaign or against your friends, parents and relatives - in multiplayer mode. -

-

- Command your forces to crush your enemies and to restore the world. -

-

- The game offers alot of addons that can be downloaded on the main website. -

- - http://wz2100.net/ - - http://static.giantbomb.com/uploads/original/0/7192/428661-000023.jpg - http://www.download26.com/modules/wfdownloads/images/screenshots/warzonescreenshot.png - http://media.moddb.com/images/downloads/1/10/9762/screen11.jpg - - -EOF - %find_lang %{name} install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ @@ -110,6 +69,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Fri Jul 29 2016 Jan Synáček - 3.2.1-1 +- Update to 3.2.1 (#1361438) + * Tue Jul 12 2016 Jan Synáček - 3.2.0-1 - Update to 3.2.0 (#1354227) From 5da12b6534181cb935e8b69ff51f9a66cb6b4ca5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 13 Nov 2016 19:34:21 +0000 Subject: [PATCH 16/82] Rebuild against compat-openssl10 --- warzone2100.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index b6bc3ff..02d8ed9 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -19,7 +19,7 @@ BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils -BuildRequires: openssl-devel +BuildRequires: compat-openssl10-devel %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and @@ -69,6 +69,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sun Nov 14 2016 Peter Robinson 3.2.1-2 +- Rebuild against compat-openssl10 + * Fri Jul 29 2016 Jan Synáček - 3.2.1-1 - Update to 3.2.1 (#1361438) From c3fa559f28a8f1b3faf8c1ab0306221ae95c7584 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 5 Dec 2016 14:07:02 +0100 Subject: [PATCH 17/82] Update to 3.2.2 (#1401273) --- warzone2100.appdata.xml | 23 ----------------------- warzone2100.spec | 16 ++++++++++------ 2 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 warzone2100.appdata.xml diff --git a/warzone2100.appdata.xml b/warzone2100.appdata.xml deleted file mode 100644 index b1842bb..0000000 --- a/warzone2100.appdata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - warzone2100.desktop - CC0-1.0 - GPL-2.0+ - Real-Time-Strategy War Game - Warzone 2100 - -

- In Warzone 2100, you command the forces of The Project in a battle to rebuild the world after mankind has almost been destroyed by nuclear missiles. -

-

- The game offers campaign, multi-player, and single-player skirmish modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics. -

-

- Warzone 2100 was originally developed as a commercial game by Pumpkin Studios and published in 1999, and was released as open source by them in 2004, for the community to continue working on it. -

- - https://wz2100.net/ - - https://wz2100.net/static/img/wz2100-CAM_3A50.png - - diff --git a/warzone2100.spec b/warzone2100.spec index 02d8ed9..622331b 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -8,14 +8,12 @@ License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz -# Upstream appdata. Currently missing from the archive (v3.2.1). Remove when the upstream tarball is fixed. -Source2: warzone2100.appdata.xml BuildRequires: physfs-devel >= 2.0 BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel BuildRequires: glew-devel >= 1.5.2 BuildRequires: SDL2_net-devel openal-soft-devel bison flex zip -BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel +BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel harfbuzz-devel BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils @@ -40,9 +38,12 @@ Video file for %{name} %prep %setup -q -cp %{SOURCE2} icons/ %build +# To silence the following errors, disable -Werror=format-security. IMHO, the code is ok. +#../../lib/framework/string_ext.h:181:98: error: format not a string literal and no format arguments [-Werror=format-security] +# static inline int ssprintf(char (&dest)[N], char const *format, P &&... params) { return snprintf(dest, N, format, std::forward

(params)...); } +export CXXFLAGS="$CXXFLAGS -Wno-format-security" %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" make %{_smp_mflags} @@ -69,6 +70,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon Dec 5 2016 Jan Synáček - 3.2.2-1 +- Update to 3.2.2 (#1401273) + * Sun Nov 14 2016 Peter Robinson 3.2.1-2 - Rebuild against compat-openssl10 From 9babb1c9e8edb09c2be7eb4d7c82bee5b49029ee Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 5 Dec 2016 14:48:35 +0100 Subject: [PATCH 18/82] Add forgotten sources (#1401273) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bd91e46..66cd34e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.1.5.tar.xz /warzone2100-3.2.0.tar.xz /warzone2100-3.2.1.tar.xz +/warzone2100-3.2.2.tar.xz diff --git a/sources b/sources index 42ec98f..ed7ce16 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1a329156387b3acfee56c7bd86fd606b warzone2100-3.2.1.tar.xz +6cb1cdf382f824d61fcce6fddee67fa7 warzone2100-3.2.2.tar.xz 6fa4d723d4019552cddf51d7ec8fb78c sequences.wz From f61c655e20e6d3158bbe6540246eb6c795ec276f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Jan 2017 09:02:36 -0700 Subject: [PATCH 19/82] Rebuild for glew 2.0.0 --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 622331b..22b51f0 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -70,6 +70,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Jan 10 2017 Orion Poplawski - 3.2.2-2 +- Rebuild for glew 2.0.0 + * Mon Dec 5 2016 Jan Synáček - 3.2.2-1 - Update to 3.2.2 (#1401273) From faf16f92620c7a1e5a984e30cc746cf2b6b74279 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:15:21 +0000 Subject: [PATCH 20/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 22b51f0..66ee116 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -70,6 +70,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 10 2017 Orion Poplawski - 3.2.2-2 - Rebuild for glew 2.0.0 From bee00dbcd2c9a352fa14031a5775d0b529ccbe71 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 20 Feb 2017 11:36:40 +0100 Subject: [PATCH 21/82] Fix FTBFS (#1424536) --- warzone2100.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 66ee116..22ccbfd 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -44,6 +44,10 @@ Video file for %{name} #../../lib/framework/string_ext.h:181:98: error: format not a string literal and no format arguments [-Werror=format-security] # static inline int ssprintf(char (&dest)[N], char const *format, P &&... params) { return snprintf(dest, N, format, std::forward

(params)...); } export CXXFLAGS="$CXXFLAGS -Wno-format-security" +# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/ZAMX5DKQF5IPWF6CYYCBNZEEMM6K5CDG/ +%ifarch %{power64} +sed -ie "s/-std=c++11//g" configure +%endif %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" make %{_smp_mflags} @@ -70,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon Feb 20 2017 Jan Synáček - 3.2.2-4 +- Fix FTBFS (#1424536) + * Sat Feb 11 2017 Fedora Release Engineering - 3.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b71d64122865fa8ce4ae5e2583e575d7192f7c5c Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 21 Feb 2017 07:46:02 +0000 Subject: [PATCH 22/82] Fix the build on RHEL --- warzone2100.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 22ccbfd..3a2c029 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -17,7 +17,11 @@ BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel harfbuz BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils +%if 0%{?fedora} >= 26 BuildRequires: compat-openssl10-devel +%else +BuildRequires: openssl-devel +%endif %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and @@ -46,7 +50,7 @@ Video file for %{name} export CXXFLAGS="$CXXFLAGS -Wno-format-security" # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/ZAMX5DKQF5IPWF6CYYCBNZEEMM6K5CDG/ %ifarch %{power64} -sed -ie "s/-std=c++11//g" configure +sed -ie "s/-std=c++11/-std=gnu++11/g" configure %endif %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" make %{_smp_mflags} From d7b6a8202e8b3d98803cf48ee17fccfacfe16a3e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 12 Mar 2017 14:04:23 +0000 Subject: [PATCH 23/82] Build with openssl 1.1 now fixed upstream --- warzone2100.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index 22ccbfd..2c35e03 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -17,7 +17,7 @@ BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel harfbuz BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils -BuildRequires: compat-openssl10-devel +BuildRequires: openssl-devel %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sun Mar 12 2017 Peter Robinson 3.2.2-5 +- Build with openssl 1.1 now fixed upstream + * Mon Feb 20 2017 Jan Synáček - 3.2.2-4 - Fix FTBFS (#1424536) From 8edcd2ca0f6b970649632a5b8c8657c3526a4e4f Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Mon, 24 Apr 2017 10:54:29 +0200 Subject: [PATCH 24/82] Update to 3.2.3 (#1444681) --- .gitignore | 1 + sources | 4 ++-- warzone2100.spec | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 66cd34e..0e2202d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.2.0.tar.xz /warzone2100-3.2.1.tar.xz /warzone2100-3.2.2.tar.xz +/warzone2100-3.2.3.tar.xz diff --git a/sources b/sources index ed7ce16..6bfb72d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6cb1cdf382f824d61fcce6fddee67fa7 warzone2100-3.2.2.tar.xz -6fa4d723d4019552cddf51d7ec8fb78c sequences.wz +SHA512 (warzone2100-3.2.3.tar.xz) = 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746 +SHA512 (sequences.wz) = d7fab931af53dbdf33d560544984fcb332318c1e122525550c2d5f01ec5726e28d98d8f2905c09959e59fa1fdcbf0986f0fc18f80d016eaaf44938dfef6052d2 diff --git a/warzone2100.spec b/warzone2100.spec index 2c35e03..c5c034f 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 -Version: 3.2.2 -Release: 5%{?dist} +Version: 3.2.3 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -48,7 +48,7 @@ export CXXFLAGS="$CXXFLAGS -Wno-format-security" %ifarch %{power64} sed -ie "s/-std=c++11//g" configure %endif -%configure --disable-rpath --enable-debug=no --with-distributor="Fedora" +%configure --disable-rpath --enable-debug=no --with-distributor="Fedora" --with-appdatadir=%{_datadir}/appdata make %{_smp_mflags} %install @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon Apr 24 2017 Jan Synáček - 3.2.3-1 +- Update to 3.2.3 (#1444681) + * Sun Mar 12 2017 Peter Robinson 3.2.2-5 - Build with openssl 1.1 now fixed upstream From f7209690dd9da09bc9e80b09418ed712e350656b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 21:31:27 +0000 Subject: [PATCH 25/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c5c034f..93c5c9a 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon May 15 2017 Fedora Release Engineering - 3.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Mon Apr 24 2017 Jan Synáček - 3.2.3-1 - Update to 3.2.3 (#1444681) From a60a9e5ae29d738699e96f39e937a3e7ecf27f05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:29:55 +0000 Subject: [PATCH 26/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 93c5c9a..f787e90 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 3.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 65579dc0880739e8bc26ce5a440224cba0a0b749 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:11:36 +0000 Subject: [PATCH 27/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index f787e90..eb4d0af 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e3bee4900bc23abc7465d49226958e02b77bb11e Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Thu, 11 Jan 2018 11:00:23 +0100 Subject: [PATCH 28/82] remove unnecessary build dependency on quesoglc-devel (#1533110) Resolves: #1533110 --- warzone2100.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index e22d1c9..229a4f7 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -14,7 +14,7 @@ BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extra BuildRequires: glew-devel >= 1.5.2 BuildRequires: SDL2_net-devel openal-soft-devel bison flex zip BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel harfbuzz-devel -BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel +BuildRequires: fribidi-devel freetype-devel fontconfig-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils BuildRequires: openssl-devel @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Jan 11 2018 Jan Synáček - 3.2.3-5 +- remove unnecessary build dependency on quesoglc-devel (#1533110) + * Thu Aug 03 2017 Fedora Release Engineering - 3.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 2cd55e8b9eda46cb5ff557c547c4b78ff1058866 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:45:50 +0000 Subject: [PATCH 29/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 229a4f7..c18f64a 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 11 2018 Jan Synáček - 3.2.3-5 - remove unnecessary build dependency on quesoglc-devel (#1533110) From 0b60f293d9f1f78964706784ff12d4d8e7e9cfd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:43:27 +0000 Subject: [PATCH 30/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c18f64a..7d7ab12 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 3.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f0dd7daae98a4815d09100eafc8f667bfa190884 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 14:10:51 +0200 Subject: [PATCH 31/82] - Rebuilt for glew 2.1.0 --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 7d7ab12..f547e6a 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games @@ -74,6 +74,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 3.2.3-8 +- Rebuilt for glew 2.1.0 + * Sat Jul 14 2018 Fedora Release Engineering - 3.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From cd6b9965e52b12e2be25ff3ebdc9dcfca70977a8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 32/82] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- warzone2100.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index f547e6a..bd2c345 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,6 @@ Version: 3.2.3 Release: 8%{?dist} Summary: Innovative 3D real-time strategy -Group: Amusements/Games License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz @@ -28,7 +27,6 @@ ReDev project was formed to take care of its future. %package sequences Summary: Video file for %{name} -Group: Amusements/Games Provides: warzone2100-data Requires: %{name} BuildArch: noarch From 487fa372ad5c37747e3b9ec4987a12f646260996 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:32:55 +0000 Subject: [PATCH 33/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index bd2c345..687e601 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -72,6 +72,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Aug 23 2018 Nicolas Chauvet - 3.2.3-8 - Rebuilt for glew 2.1.0 From 0a20f28bd2faad4dca2a80a99d59d4090ba77e13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:17:42 +0000 Subject: [PATCH 34/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 687e601..6159b20 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -72,6 +72,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c9d7a0c136d6c95a7514a4d7cf009f8b1ef5d7ca Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 5 Sep 2019 10:58:31 +0100 Subject: [PATCH 35/82] Update to 3.3.0 (#1748064) --- .gitignore | 1 + sources | 2 +- warzone2100.spec | 20 ++++++++------------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0e2202d..8435ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.2.1.tar.xz /warzone2100-3.2.2.tar.xz /warzone2100-3.2.3.tar.xz +/warzone2100-3.3.0_src.tar.xz diff --git a/sources b/sources index 6bfb72d..c0c806b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (warzone2100-3.2.3.tar.xz) = 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746 +SHA512 (warzone2100-3.3.0_src.tar.xz) = 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559 SHA512 (sequences.wz) = d7fab931af53dbdf33d560544984fcb332318c1e122525550c2d5f01ec5726e28d98d8f2905c09959e59fa1fdcbf0986f0fc18f80d016eaaf44938dfef6052d2 diff --git a/warzone2100.spec b/warzone2100.spec index 6159b20..ff5ec08 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,11 +1,11 @@ Name: warzone2100 -Version: 3.2.3 -Release: 10%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ -Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz +Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}_src.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz BuildRequires: physfs-devel >= 2.0 @@ -35,17 +35,10 @@ BuildArch: noarch Video file for %{name} %prep -%setup -q +%setup -q -n %{name} %build -# To silence the following errors, disable -Werror=format-security. IMHO, the code is ok. -#../../lib/framework/string_ext.h:181:98: error: format not a string literal and no format arguments [-Werror=format-security] -# static inline int ssprintf(char (&dest)[N], char const *format, P &&... params) { return snprintf(dest, N, format, std::forward

(params)...); } -export CXXFLAGS="$CXXFLAGS -Wno-format-security" -# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/ZAMX5DKQF5IPWF6CYYCBNZEEMM6K5CDG/ -%ifarch %{power64} -sed -ie "s/-std=c++11/-std=gnu++11/g" configure -%endif +./autogen.sh %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" --with-appdatadir=%{_datadir}/appdata make %{_smp_mflags} @@ -72,6 +65,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Thu Sep 05 2019 Pete Walter - 3.3.0-1 +- Update to 3.3.0 (#1748064) + * Sat Jul 27 2019 Fedora Release Engineering - 3.2.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 66da5041a146caa879b095344f32bf0aa4e4b048 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 9 Sep 2019 10:25:25 +0100 Subject: [PATCH 36/82] Install icons in hicolor icon theme --- warzone2100.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index ff5ec08..c2f80d3 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -18,6 +18,8 @@ BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils BuildRequires: openssl-devel +Requires: hicolor-icon-theme + %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and most will agree it didn't enjoy the commercial success it should have had. The @@ -39,7 +41,7 @@ Video file for %{name} %build ./autogen.sh -%configure --disable-rpath --enable-debug=no --with-distributor="Fedora" --with-appdatadir=%{_datadir}/appdata +%configure --disable-rpath --enable-debug=no --with-distributor="Fedora" --with-appdatadir=%{_datadir}/appdata --with-icondir=%{_datadir}/icons/hicolor/128x128/apps make %{_smp_mflags} %install @@ -54,9 +56,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %files -f %{name}.lang %{_bindir}/%{name} -%{_datadir}/icons/warzone* %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/128x128/apps/%{name}.png %{_datadir}/%{name} %exclude %{_datadir}/%{name}/sequences.wz %doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README @@ -65,6 +67,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Mon Sep 09 2019 Pete Walter - 3.3.0-2 +- Install icons in hicolor icon theme + * Thu Sep 05 2019 Pete Walter - 3.3.0-1 - Update to 3.3.0 (#1748064) From 444890c59e8499cb1661bba6b8177174d2748a25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:29:42 +0000 Subject: [PATCH 37/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c2f80d3..90cf4e7 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -67,6 +67,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Sep 09 2019 Pete Walter - 3.3.0-2 - Install icons in hicolor icon theme From 2c42576f2434e8f457bbec3036fb73962e0fe844 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:58:32 +0000 Subject: [PATCH 38/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 90cf4e7..f182d72 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -67,6 +67,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 3.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 50f69f254f178642f0f8e164075abac14b11fb8a Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 17 Oct 2020 12:41:20 -0600 Subject: [PATCH 39/82] Fix missing #include for gcc-11 --- warzone2100-gcc11.patch | 12 ++++++++++++ warzone2100.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 warzone2100-gcc11.patch diff --git a/warzone2100-gcc11.patch b/warzone2100-gcc11.patch new file mode 100644 index 0000000..51a39c5 --- /dev/null +++ b/warzone2100-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/lib/framework/wzstring.cpp b/lib/framework/wzstring.cpp +index fd381fc..f1709e5 100644 +--- a/lib/framework/wzstring.cpp ++++ b/lib/framework/wzstring.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/warzone2100.spec b/warzone2100.spec index f182d72..82eeb15 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,12 +1,13 @@ Name: warzone2100 Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}_src.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz +Patch0: %{name}-gcc11.patch BuildRequires: physfs-devel >= 2.0 BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel @@ -38,6 +39,7 @@ Video file for %{name} %prep %setup -q -n %{name} +%patch0 -p1 %build ./autogen.sh @@ -67,6 +69,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Sat Oct 17 2020 Jeff Law - 3.3.0-5 +- Fix missing #include for gcc-11 + * Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 889b11f01adccd833f70367910f002a297421f05 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:49:33 +0000 Subject: [PATCH 40/82] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- warzone2100.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/warzone2100.spec b/warzone2100.spec index 82eeb15..10ae599 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{vers Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz Patch0: %{name}-gcc11.patch +BuildRequires: make BuildRequires: physfs-devel >= 2.0 BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel BuildRequires: glew-devel >= 1.5.2 From d491caa522cd07ff96559b23f20a7fb153961f55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:19:50 +0000 Subject: [PATCH 41/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 10ae599..e6b5f57 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -70,6 +70,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Oct 17 2020 Jeff Law - 3.3.0-5 - Fix missing #include for gcc-11 From f744fb2fc0802b209b4e954e8444d75b9f0fbe99 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:40:41 +0100 Subject: [PATCH 42/82] Rebuilt for removed libstdc++ symbol (#1937698) --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index e6b5f57..ae89495 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,6 +1,6 @@ Name: warzone2100 Version: 3.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -70,6 +70,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Mar 30 2021 Jonathan Wakely - 3.3.0-7 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Wed Jan 27 2021 Fedora Release Engineering - 3.3.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 27d34cf9b493b6641f4ca723ce5bf857ad0cf190 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 27 May 2021 14:16:55 +0100 Subject: [PATCH 43/82] Update to 4.0.1 --- .gitignore | 1 + sources | 2 +- warzone2100-gcc11.patch | 12 -------- warzone2100.spec | 68 ++++++++++++++++++++++++++--------------- 4 files changed, 46 insertions(+), 37 deletions(-) delete mode 100644 warzone2100-gcc11.patch diff --git a/.gitignore b/.gitignore index 8435ffd..f32172a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.2.2.tar.xz /warzone2100-3.2.3.tar.xz /warzone2100-3.3.0_src.tar.xz +/warzone2100_src.tar.xz diff --git a/sources b/sources index c0c806b..d999657 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (warzone2100-3.3.0_src.tar.xz) = 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559 +SHA512 (warzone2100_src.tar.xz) = 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180 SHA512 (sequences.wz) = d7fab931af53dbdf33d560544984fcb332318c1e122525550c2d5f01ec5726e28d98d8f2905c09959e59fa1fdcbf0986f0fc18f80d016eaaf44938dfef6052d2 diff --git a/warzone2100-gcc11.patch b/warzone2100-gcc11.patch deleted file mode 100644 index 51a39c5..0000000 --- a/warzone2100-gcc11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/framework/wzstring.cpp b/lib/framework/wzstring.cpp -index fd381fc..f1709e5 100644 ---- a/lib/framework/wzstring.cpp -+++ b/lib/framework/wzstring.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/warzone2100.spec b/warzone2100.spec index ae89495..87eb869 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,24 +1,38 @@ +# Don't build internal static libs as shared +%global _cmake_shared_libs %{nil} + Name: warzone2100 -Version: 3.3.0 -Release: 7%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ -Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}_src.tar.xz +Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz -Patch0: %{name}-gcc11.patch -BuildRequires: make -BuildRequires: physfs-devel >= 2.0 -BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel -BuildRequires: glew-devel >= 1.5.2 -BuildRequires: SDL2_net-devel openal-soft-devel bison flex zip -BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel harfbuzz-devel -BuildRequires: fribidi-devel freetype-devel fontconfig-devel popt-devel gettext libtheora-devel -BuildRequires: automake >= 1.8 -BuildRequires: desktop-file-utils -BuildRequires: openssl-devel +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: freetype-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: glslc +BuildRequires: harfbuzz-devel +BuildRequires: libcurl-devel +BuildRequires: libogg-devel +BuildRequires: libpng-devel +BuildRequires: libsodium-devel +BuildRequires: libtheora-devel +BuildRequires: libvorbis-devel +BuildRequires: openal-soft-devel +BuildRequires: openssl-devel +BuildRequires: p7zip +BuildRequires: physfs-devel +BuildRequires: rubygem-asciidoctor +BuildRequires: SDL2-devel +BuildRequires: sqlite-devel +BuildRequires: vulkan-devel Requires: hicolor-icon-theme @@ -40,36 +54,42 @@ Video file for %{name} %prep %setup -q -n %{name} -%patch0 -p1 + +# Don't use -Werror for distro builds +sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt %build -./autogen.sh -%configure --disable-rpath --enable-debug=no --with-distributor="Fedora" --with-appdatadir=%{_datadir}/appdata --with-icondir=%{_datadir}/icons/hicolor/128x128/apps -make %{_smp_mflags} +%cmake -DWZ_DISTRIBUTOR=Fedora +%cmake_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%cmake_install rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} -desktop-file-install \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - %find_lang %{name} install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ +# Fix icon install path +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps +mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/warzone2100.png + %files -f %{name}.lang %{_bindir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%{_datadir}/metainfo/warzone2100.appdata.xml %{_datadir}/%{name} %exclude %{_datadir}/%{name}/sequences.wz +%{_mandir}/man6/warzone2100.6* %doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README %files sequences %{_datadir}/%{name}/sequences.wz %changelog +* Thu May 27 2021 Pete Walter - 4.0.1-1 +- Update to 4.0.1 + * Tue Mar 30 2021 Jonathan Wakely - 3.3.0-7 - Rebuilt for removed libstdc++ symbol (#1937698) From 4acc8e397076eb8e188e94a2ce81b3106d15bdea Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 27 May 2021 14:22:12 +0100 Subject: [PATCH 44/82] Spec clean up --- warzone2100.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index 87eb869..4d5531c 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -45,15 +45,14 @@ ReDev project was formed to take care of its future. %package sequences Summary: Video file for %{name} -Provides: warzone2100-data Requires: %{name} BuildArch: noarch %description sequences -Video file for %{name} +Video file for %{name}. %prep -%setup -q -n %{name} +%autosetup -p1 -n warzone2100 # Don't use -Werror for distro builds sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt @@ -66,7 +65,7 @@ sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt %cmake_install rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} %find_lang %{name} -install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/warzone2100/ # Fix icon install path mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps @@ -74,17 +73,18 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/warzone2100.png %files -f %{name}.lang -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/128x128/apps/%{name}.png +%license COPYING COPYING.NONGPL COPYING.README +%doc AUTHORS ChangeLog +%{_bindir}/warzone2100 +%{_datadir}/applications/warzone2100.desktop +%{_datadir}/icons/hicolor/128x128/apps/warzone2100.png %{_datadir}/metainfo/warzone2100.appdata.xml -%{_datadir}/%{name} -%exclude %{_datadir}/%{name}/sequences.wz +%{_datadir}/warzone2100/ +%exclude %{_datadir}/warzone2100/sequences.wz %{_mandir}/man6/warzone2100.6* -%doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README %files sequences -%{_datadir}/%{name}/sequences.wz +%{_datadir}/warzone2100/sequences.wz %changelog * Thu May 27 2021 Pete Walter - 4.0.1-1 From 3c1d6576b6801407df291b2781e8fbd5cf9b0ec9 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 27 May 2021 14:57:09 +0100 Subject: [PATCH 45/82] Install high quality intro sequences --- .gitignore | 1 + sources | 2 +- warzone2100.spec | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f32172a..2b4a827 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ warzone2100-2.3.3.tar.gz /warzone2100-3.2.3.tar.xz /warzone2100-3.3.0_src.tar.xz /warzone2100_src.tar.xz +/high-quality-en-sequences.wz diff --git a/sources b/sources index d999657..fd18cdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 SHA512 (warzone2100_src.tar.xz) = 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180 -SHA512 (sequences.wz) = d7fab931af53dbdf33d560544984fcb332318c1e122525550c2d5f01ec5726e28d98d8f2905c09959e59fa1fdcbf0986f0fc18f80d016eaaf44938dfef6052d2 diff --git a/warzone2100.spec b/warzone2100.spec index 4d5531c..87b8601 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -9,7 +9,7 @@ Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz -Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz +Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz BuildRequires: cmake BuildRequires: desktop-file-utils @@ -89,6 +89,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ %changelog * Thu May 27 2021 Pete Walter - 4.0.1-1 - Update to 4.0.1 +- Install high quality intro sequences * Tue Mar 30 2021 Jonathan Wakely - 3.3.0-7 - Rebuilt for removed libstdc++ symbol (#1937698) From be7fec4c8e6a7ab99e82e17bb82ed31436f42c31 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 27 May 2021 15:03:28 +0100 Subject: [PATCH 46/82] Recommends sequences subpackage --- warzone2100.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/warzone2100.spec b/warzone2100.spec index 87b8601..c394c50 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -35,6 +35,7 @@ BuildRequires: sqlite-devel BuildRequires: vulkan-devel Requires: hicolor-icon-theme +Recommends: %{name}-sequences %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and @@ -90,6 +91,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ * Thu May 27 2021 Pete Walter - 4.0.1-1 - Update to 4.0.1 - Install high quality intro sequences +- Recommends sequences subpackage * Tue Mar 30 2021 Jonathan Wakely - 3.3.0-7 - Rebuilt for removed libstdc++ symbol (#1937698) From d6d831e421eac0048633be045e258ecb62d589de Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 27 May 2021 15:25:07 +0100 Subject: [PATCH 47/82] Fix the build --- warzone2100.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c394c50..063f848 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -66,7 +66,7 @@ sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt %cmake_install rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} %find_lang %{name} -install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/warzone2100/ +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/warzone2100/sequences.wz # Fix icon install path mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps From c2101f964a8339b1deb51f9a38e2a2865fcfce0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:45:56 +0000 Subject: [PATCH 48/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 063f848..0423197 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -88,6 +88,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu May 27 2021 Pete Walter - 4.0.1-1 - Update to 4.0.1 - Install high quality intro sequences From 8cfd4d06064673b3e3144bf1464fd2ce95bc5d78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:16:42 +0000 Subject: [PATCH 49/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 0423197..6a9c18e 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -88,6 +88,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2053248fc1610ff443d1a2ed7e5ed569325b39e2 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 21 Mar 2022 12:03:42 +0000 Subject: [PATCH 50/82] Update to 4.2.7 --- sources | 2 +- warzone2100.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sources b/sources index fd18cdb..0571459 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180 +SHA512 (warzone2100_src.tar.xz) = af538f3bdf6ec543e5f919377c95c35c730fa6efa5c3ea8d140347595dd9f8056677d4b494677ea20c98da305e0fb588cdb00a3da1c497f96edc58ca8772e45b diff --git a/warzone2100.spec b/warzone2100.spec index 6a9c18e..c84e0b7 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,8 +2,8 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.0.1 -Release: 3%{?dist} +Version: 4.2.7 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} %find_lang %{name} install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/warzone2100/sequences.wz +# Don't use portable (Windows) install +rm $RPM_BUILD_ROOT%{_bindir}/.portable + # Fix icon install path mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ @@ -88,6 +91,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Mon Mar 21 2022 Pete Walter - 4.2.7-1 +- Update to 4.2.7 + * Sat Jan 22 2022 Fedora Release Engineering - 4.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ff34a93e85e7a543220197cd04444f793fa92d99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:12:57 +0000 Subject: [PATCH 51/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c84e0b7..cf37e86 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -91,6 +91,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Mar 21 2022 Pete Walter - 4.2.7-1 - Update to 4.2.7 From 6834bd0e18088acd8ec2bd8e61754deab369fda2 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 21 Nov 2022 13:22:26 +0000 Subject: [PATCH 52/82] Update to 4.3.2 (#2134915) --- sources | 2 +- warzone2100.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 0571459..b382908 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = af538f3bdf6ec543e5f919377c95c35c730fa6efa5c3ea8d140347595dd9f8056677d4b494677ea20c98da305e0fb588cdb00a3da1c497f96edc58ca8772e45b +SHA512 (warzone2100_src.tar.xz) = 9451aee1418aa4fd7ebbc3e40187bbee1645d2c79d1e719e1211e021c474e481355705aaa375716d048d1bae389f8db2f98678a40cc757702cf285957cfcbf46 diff --git a/warzone2100.spec b/warzone2100.spec index cf37e86..bbf9082 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,8 +2,8 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.2.7 -Release: 2%{?dist} +Version: 4.3.2 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -91,6 +91,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Mon Nov 21 2022 Pete Walter - 4.3.2-1 +- Update to 4.3.2 (#2134915) + * Sat Jul 23 2022 Fedora Release Engineering - 4.2.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1a34ae8d9ec9ba9d07f5aad697be138bd76163ed Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 21 Nov 2022 14:00:58 +0000 Subject: [PATCH 53/82] Fix the build --- warzone2100.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index bbf9082..1c9d7c3 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -27,6 +27,7 @@ BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel +BuildRequires: opus-devel BuildRequires: p7zip BuildRequires: physfs-devel BuildRequires: rubygem-asciidoctor @@ -68,21 +69,18 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} %find_lang %{name} install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/warzone2100/sequences.wz -# Don't use portable (Windows) install -rm $RPM_BUILD_ROOT%{_bindir}/.portable - # Fix icon install path mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps -mv $RPM_BUILD_ROOT%{_datadir}/icons/warzone2100.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/warzone2100.png +mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/net.wz2100.warzone2100.png %files -f %{name}.lang %license COPYING COPYING.NONGPL COPYING.README %doc AUTHORS ChangeLog %{_bindir}/warzone2100 -%{_datadir}/applications/warzone2100.desktop -%{_datadir}/icons/hicolor/128x128/apps/warzone2100.png -%{_datadir}/metainfo/warzone2100.appdata.xml +%{_datadir}/applications/net.wz2100.warzone2100.desktop +%{_datadir}/icons/hicolor/128x128/apps/net.wz2100.warzone2100.png +%{_datadir}/metainfo/net.wz2100.warzone2100.appdata.xml %{_datadir}/warzone2100/ %exclude %{_datadir}/warzone2100/sequences.wz %{_mandir}/man6/warzone2100.6* From 59bc57405568a48bbb309410244b25915f43cbd4 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 9 Jan 2023 23:04:22 +0000 Subject: [PATCH 54/82] Update to 4.3.3 (#2158024) --- sources | 2 +- warzone2100.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b382908..5135085 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = 9451aee1418aa4fd7ebbc3e40187bbee1645d2c79d1e719e1211e021c474e481355705aaa375716d048d1bae389f8db2f98678a40cc757702cf285957cfcbf46 +SHA512 (warzone2100_src.tar.xz) = d72ef7842eea897e93b9234be30932446a936c058895b2f1032a11d8c9b3da33990acd4b47875ecbdd4f424174af93b7e8bcfa69fd08b8bebb03eb7074c82437 diff --git a/warzone2100.spec b/warzone2100.spec index 1c9d7c3..0c26bad 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,7 +2,7 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -89,6 +89,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Mon Jan 09 2023 Pete Walter - 4.3.3-1 +- Update to 4.3.3 (#2158024) + * Mon Nov 21 2022 Pete Walter - 4.3.2-1 - Update to 4.3.2 (#2134915) From 9fd49355c2aada218dd40d98f448d36e3f9f1bd3 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 9 Jan 2023 23:31:29 +0000 Subject: [PATCH 55/82] Fix sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 5135085..70e240e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = d72ef7842eea897e93b9234be30932446a936c058895b2f1032a11d8c9b3da33990acd4b47875ecbdd4f424174af93b7e8bcfa69fd08b8bebb03eb7074c82437 +SHA512 (warzone2100_src.tar.xz) = 46ccf2720d09481dfc89c1e3abb9802a379d1bfe0b3823566b51f2ea177fd793653d5b2592f07c724f0121cafd014c1ea6226b8c2bc22ec12ac3ca1bfaf298f4 From bf42ad4581f60e07eb59b8718a0d7e8da48e3747 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:36:36 +0000 Subject: [PATCH 56/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 0c26bad..4b1c387 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -89,6 +89,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Pete Walter - 4.3.3-1 - Update to 4.3.3 (#2158024) From a5a708100b54f157979b55ee5ff71250c8cfdbc3 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 3 Feb 2023 23:23:35 +0000 Subject: [PATCH 57/82] ExcludeArch i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- warzone2100.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 4b1c387..db16886 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -11,6 +11,9 @@ URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: freetype-devel @@ -89,6 +92,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Fri Feb 03 2023 Pete Walter - 4.3.3-3 +- ExcludeArch i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval + * Sat Jan 21 2023 Fedora Release Engineering - 4.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1ee922fe7d25371fdb578c37000f06faf5c0b65d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 12 Mar 2023 17:25:47 +0000 Subject: [PATCH 58/82] Fix FTBFS (rhbz#2171756) --- fix-ftbfs.patch | 27 +++++++++++++++++++++++++++ warzone2100.spec | 8 +++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fix-ftbfs.patch diff --git a/fix-ftbfs.patch b/fix-ftbfs.patch new file mode 100644 index 0000000..c0adee7 --- /dev/null +++ b/fix-ftbfs.patch @@ -0,0 +1,27 @@ +From e872db579ec2847de29d1e3a96b35902f643b9fb Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 21 Jan 2023 21:00:02 +0000 +Subject: [PATCH] Fix build with GCC 13 (add missing include) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so is no longer transitively included. + +Explicitly include for uint32_t. + +Signed-off-by: Sam James +--- + lib/framework/wzstring.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/framework/wzstring.h b/lib/framework/wzstring.h +index 1a9391cd11a..40796c838a4 100644 +--- a/lib/framework/wzstring.h ++++ b/lib/framework/wzstring.h +@@ -20,6 +20,7 @@ + #ifndef _LIB_FRAMEWORK_WZSTRING_H + #define _LIB_FRAMEWORK_WZSTRING_H + ++#include + #include + #include + #include diff --git a/warzone2100.spec b/warzone2100.spec index db16886..af60e53 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -11,6 +11,9 @@ URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz +# https://github.com/Warzone2100/warzone2100/pull/3090 +Patch: fix-ftbfs.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -92,6 +95,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sun Mar 12 2023 Pete Walter - 4.3.3-4 +- Fix FTBFS (rhbz#2171756) + * Fri Feb 03 2023 Pete Walter - 4.3.3-3 - ExcludeArch i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval From 4c79551af231c7df9021e19708fed08987c0ad22 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 Apr 2023 13:29:22 +0100 Subject: [PATCH 59/82] Update to 4.3.5 (rhbz#2182221) --- fix-ftbfs.patch | 27 --------------------------- sources | 2 +- warzone2100.spec | 10 +++++----- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 fix-ftbfs.patch diff --git a/fix-ftbfs.patch b/fix-ftbfs.patch deleted file mode 100644 index c0adee7..0000000 --- a/fix-ftbfs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e872db579ec2847de29d1e3a96b35902f643b9fb Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 21 Jan 2023 21:00:02 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so is no longer transitively included. - -Explicitly include for uint32_t. - -Signed-off-by: Sam James ---- - lib/framework/wzstring.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/framework/wzstring.h b/lib/framework/wzstring.h -index 1a9391cd11a..40796c838a4 100644 ---- a/lib/framework/wzstring.h -+++ b/lib/framework/wzstring.h -@@ -20,6 +20,7 @@ - #ifndef _LIB_FRAMEWORK_WZSTRING_H - #define _LIB_FRAMEWORK_WZSTRING_H - -+#include - #include - #include - #include diff --git a/sources b/sources index 70e240e..ab9f102 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = 46ccf2720d09481dfc89c1e3abb9802a379d1bfe0b3823566b51f2ea177fd793653d5b2592f07c724f0121cafd014c1ea6226b8c2bc22ec12ac3ca1bfaf298f4 +SHA512 (warzone2100_src.tar.xz) = ec65f22a0aad9fe482c4ea916cb321d171b10f0a9b181fea7db2eb17bf54e32b3828c8259082fff266713e2cab4e32dcc455d0d5b923a5ca221fc77b11137062 diff --git a/warzone2100.spec b/warzone2100.spec index af60e53..162a52a 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,8 +2,8 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.3.3 -Release: 4%{?dist} +Version: 4.3.5 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -11,9 +11,6 @@ URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz -# https://github.com/Warzone2100/warzone2100/pull/3090 -Patch: fix-ftbfs.patch - # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -95,6 +92,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Thu Apr 20 2023 Pete Walter - 4.3.5-1 +- Update to 4.3.5 (rhbz#2182221) + * Sun Mar 12 2023 Pete Walter - 4.3.3-4 - Fix FTBFS (rhbz#2171756) From 768c93a3650b80ec78d6a3342b46d368497c6350 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:58:47 +0000 Subject: [PATCH 60/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 162a52a..b079f6e 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -92,6 +92,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 20 2023 Pete Walter - 4.3.5-1 - Update to 4.3.5 (rhbz#2182221) From e00854200e339b755248f342dddc1867d69d4f83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Oct 2023 10:04:35 +0200 Subject: [PATCH 61/82] rebuild for new libsodium --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index b079f6e..f09f106 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -92,6 +92,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Thu Oct 05 2023 Remi Collet - 4.3.5-3 +- rebuild for new libsodium + * Sat Jul 22 2023 Fedora Release Engineering - 4.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 279157f27d57369b0f520b94fc3cfaf9bc008be1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Nov 2023 22:40:14 +0900 Subject: [PATCH 62/82] Backport upstream patch for new vulkan header (#2242267) --- warzone2100-pr3353-new-vulkan-header.patch | 63 ++++++++++++++++++++++ warzone2100.spec | 7 ++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 warzone2100-pr3353-new-vulkan-header.patch diff --git a/warzone2100-pr3353-new-vulkan-header.patch b/warzone2100-pr3353-new-vulkan-header.patch new file mode 100644 index 0000000..fc37ee5 --- /dev/null +++ b/warzone2100-pr3353-new-vulkan-header.patch @@ -0,0 +1,63 @@ +From cdac3fc02a210f249b5ff078ee180235f46f65a1 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 25 Jun 2023 17:30:39 +0200 +Subject: [PATCH] [Vulkan] Fix the build with vulkan-header >= 1.3.260 + +Add detail:: namespace to throwResultException +--- + lib/ivis_opengl/gfx_api_vk.cpp | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp +index b89167bd96a..fa14d5bbaf7 100644 +--- a/lib/ivis_opengl/gfx_api_vk.cpp ++++ b/lib/ivis_opengl/gfx_api_vk.cpp +@@ -59,6 +59,12 @@ + #pragma GCC diagnostic ignored "-Wdeprecated-copy" // Ignore warnings caused by vulkan.hpp 148 + #endif + ++#if VK_HEADER_VERSION >= 260 ++# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::detail::throwResultException(result, message) ++#else ++# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::throwResultException(result, message) ++#endif ++ + const uint32_t minSupportedVulkanVersion = VK_API_VERSION_1_0; + #if defined(DEBUG) + // For debug builds, limit to the minimum that should be supported by this backend (which is Vulkan 1.0, see above) +@@ -549,7 +555,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t minimumSize) + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- vk::throwResultException( result, "vmaCreateBuffer" ); ++ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" ); + } + + if (autoMap) +@@ -1760,7 +1766,7 @@ VkPSO::VkPSO(vk::Device _dev, + object = std::move(result.value); + break; + default: +- vk::throwResultException(result.result, "createGraphicsPipeline"); ++ WZ_THROW_VK_RESULT_EXCEPTION(result.result, "createGraphicsPipeline"); + } + } + +@@ -1824,7 +1830,7 @@ void VkBuf::allocateBufferObject(const std::size_t& size) + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- vk::throwResultException( result, "vmaCreateBuffer" ); ++ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" ); + } + + buffer_size = size; +@@ -1966,7 +1972,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::size_t& mipmap_count, const + if (result != vk::Result::eSuccess) + { + // Failed to allocate memory! +- vk::throwResultException( result, "vmaCreateImage" ); ++ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateImage" ); + } + + if (root.debugUtilsExtEnabled) diff --git a/warzone2100.spec b/warzone2100.spec index f09f106..c8cb701 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,13 +3,15 @@ Name: warzone2100 Version: 4.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz +# https://github.com/Warzone2100/warzone2100/pull/3353 +Patch0: warzone2100-pr3353-new-vulkan-header.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -92,6 +94,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Thu Nov 1 2023 Mamoru TASAKA - 4.3.5-4 +- Backport upstream patch for new vulkan header (#2242267) + * Thu Oct 05 2023 Remi Collet - 4.3.5-3 - rebuild for new libsodium From 149939e4d98d24cd91e65d5469971ad859ea1330 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Nov 2023 22:40:54 +0900 Subject: [PATCH 63/82] fix date --- warzone2100.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index c8cb701..f58b66d 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -94,7 +94,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog -* Thu Nov 1 2023 Mamoru TASAKA - 4.3.5-4 +* Wed Nov 1 2023 Mamoru TASAKA - 4.3.5-4 - Backport upstream patch for new vulkan header (#2242267) * Thu Oct 05 2023 Remi Collet - 4.3.5-3 From f8c7efe8cc0dbcbb3f2c0443af4b375d6635e567 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:23:39 +0000 Subject: [PATCH 64/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index f58b66d..b624860 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -94,6 +94,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Nov 1 2023 Mamoru TASAKA - 4.3.5-4 - Backport upstream patch for new vulkan header (#2242267) From eac39b6570223f8f06a8a24b52b155b576f57b76 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 7 May 2024 21:57:08 -0400 Subject: [PATCH 65/82] Fix bundled rapidjson build with GCC 14 Based on https://src.fedoraproject.org/rpms/rapidjson/c/34faab1e310c2a97cbb4957b32ed6f8c3642fdb7 --- ...iling-assignment-operator.-Fixed-718.patch | 25 ++++++++++ ...tly-disable-copy-assignment-operator.patch | 25 ++++++++++ ...way-comparison-for-CLang-10-fix-1679.patch | 50 +++++++++++++++++++ ...recursive-operator-call-in-C-20-1846.patch | 32 ++++++++++++ ...of-symmetric-equality-operators-on-i.patch | 29 +++++++++++ 1006-do-not-define-operator-in-C-20.patch | 37 ++++++++++++++ warzone2100.spec | 21 +++++++- 7 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch create mode 100644 1002-Explicitly-disable-copy-assignment-operator.patch create mode 100644 1003-Three-way-comparison-for-CLang-10-fix-1679.patch create mode 100644 1004-Fix-recursive-operator-call-in-C-20-1846.patch create mode 100644 1005-gate-definition-of-symmetric-equality-operators-on-i.patch create mode 100644 1006-do-not-define-operator-in-C-20.patch diff --git a/1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch b/1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch new file mode 100644 index 0000000..a31737f --- /dev/null +++ b/1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch @@ -0,0 +1,25 @@ +From 1257fe9096b70cc278f9d6e4029776b50df5d5cf Mon Sep 17 00:00:00 2001 +From: Janusz Chorko +Date: Fri, 26 Aug 2016 21:17:38 +0200 +Subject: [PATCH 1/7] Removed non-compiling assignment operator. Fixed #718 + +--- + include/rapidjson/document.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index e3e20dfb..b0f1f70b 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + +-- +2.43.0 + diff --git a/1002-Explicitly-disable-copy-assignment-operator.patch b/1002-Explicitly-disable-copy-assignment-operator.patch new file mode 100644 index 0000000..54a514f --- /dev/null +++ b/1002-Explicitly-disable-copy-assignment-operator.patch @@ -0,0 +1,25 @@ +From f9d9e50caca4673f194115b059fe5daef77163fd Mon Sep 17 00:00:00 2001 +From: Janusz Chorko +Date: Fri, 26 Aug 2016 21:26:50 +0200 +Subject: [PATCH 2/7] Explicitly disable copy assignment operator + +--- + include/rapidjson/document.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index b0f1f70b..19f5a6a5 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -326,6 +326,8 @@ private: + //! Disallow construction from non-const array + template + GenericStringRef(CharType (&str)[N]) /* = delete */; ++ //! Copy assignment operator not permitted - immutable type ++ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */; + }; + + //! Mark a character pointer as constant string +-- +2.43.0 + diff --git a/1003-Three-way-comparison-for-CLang-10-fix-1679.patch b/1003-Three-way-comparison-for-CLang-10-fix-1679.patch new file mode 100644 index 0000000..637463c --- /dev/null +++ b/1003-Three-way-comparison-for-CLang-10-fix-1679.patch @@ -0,0 +1,50 @@ +From 2cecf24712bfe0f3d821a6f3763156066c7c40ec Mon Sep 17 00:00:00 2001 +From: Nikolay <211292+kolya7k@users.noreply.github.com> +Date: Mon, 30 Mar 2020 07:20:35 +0500 +Subject: [PATCH 3/7] Three-way comparison for CLang 10 fix (#1679) + +C++20 features must enable additional functionality, not to change interface completely +--- + include/rapidjson/document.h | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index 19f5a6a5..8e13d1cc 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -24,6 +24,9 @@ + #include "encodedstream.h" + #include // placement new + #include ++#ifdef __cpp_lib_three_way_comparison ++#include ++#endif + + RAPIDJSON_DIAG_PUSH + #ifdef _MSC_VER +@@ -168,12 +171,16 @@ public: + + //! @name relations + //@{ +- bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; } +- bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; } +- bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; } +- bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; } +- bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; } +- bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; } ++ template bool operator==(const GenericMemberIterator& that) const { return ptr_ == that.ptr_; } ++ template bool operator!=(const GenericMemberIterator& that) const { return ptr_ != that.ptr_; } ++ template bool operator<=(const GenericMemberIterator& that) const { return ptr_ <= that.ptr_; } ++ template bool operator>=(const GenericMemberIterator& that) const { return ptr_ >= that.ptr_; } ++ template bool operator< (const GenericMemberIterator& that) const { return ptr_ < that.ptr_; } ++ template bool operator> (const GenericMemberIterator& that) const { return ptr_ > that.ptr_; } ++ ++#ifdef __cpp_lib_three_way_comparison ++ template std::strong_ordering operator<=>(const GenericMemberIterator& that) const { return ptr_ <=> that.ptr_; } ++#endif + //@} + + //! @name dereference +-- +2.43.0 + diff --git a/1004-Fix-recursive-operator-call-in-C-20-1846.patch b/1004-Fix-recursive-operator-call-in-C-20-1846.patch new file mode 100644 index 0000000..2aca216 --- /dev/null +++ b/1004-Fix-recursive-operator-call-in-C-20-1846.patch @@ -0,0 +1,32 @@ +From 11a7270fabf0c39cca0771453ae8a5df42d58f42 Mon Sep 17 00:00:00 2001 +From: Laurent Stacul +Date: Mon, 22 Feb 2021 16:11:42 +0000 +Subject: [PATCH 4/7] Fix recursive operator== call in C++20 (#1846) + +--- + include/rapidjson/document.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index 8e13d1cc..3c354a79 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -926,6 +926,7 @@ public: + */ + template RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); } + ++#ifndef __cpp_lib_three_way_comparison + //! Equal-to operator with arbitrary types (symmetric version) + /*! \return (rhs == lhs) + */ +@@ -936,6 +937,7 @@ public: + */ + template friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); } + //@} ++#endif + + //!@name Type + //@{ +-- +2.43.0 + diff --git a/1005-gate-definition-of-symmetric-equality-operators-on-i.patch b/1005-gate-definition-of-symmetric-equality-operators-on-i.patch new file mode 100644 index 0000000..886a5dc --- /dev/null +++ b/1005-gate-definition-of-symmetric-equality-operators-on-i.patch @@ -0,0 +1,29 @@ +From 424d1b95c7d95ac82f49bba82fdd05c29f73a2c1 Mon Sep 17 00:00:00 2001 +From: Kent Ross +Date: Mon, 14 Mar 2022 12:25:26 -0700 +Subject: [PATCH 5/7] gate definition of symmetric equality operators on impl, + not lib + +These operators call themselves recursively if C++20 semantics are present in the compiler, regardless of standard library support for the operator; therefore the test should be on __cpp_impl_three_way_comparison, not __cpp_lib_[...]. + +This fixes the Value.EqualtoOperator test when the language standard is set to C++20 and the standard library does not yet define the library support macro. +--- + include/rapidjson/document.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index 3c354a79..46510f85 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -926,7 +926,7 @@ public: + */ + template RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); } + +-#ifndef __cpp_lib_three_way_comparison ++#ifndef __cpp_impl_three_way_comparison + //! Equal-to operator with arbitrary types (symmetric version) + /*! \return (rhs == lhs) + */ +-- +2.43.0 + diff --git a/1006-do-not-define-operator-in-C-20.patch b/1006-do-not-define-operator-in-C-20.patch new file mode 100644 index 0000000..383c33a --- /dev/null +++ b/1006-do-not-define-operator-in-C-20.patch @@ -0,0 +1,37 @@ +From 42ca72bf3a161cf8d5e43f5d4f68aeeec3f7e6b4 Mon Sep 17 00:00:00 2001 +From: Kent Ross +Date: Thu, 3 Nov 2022 20:17:41 -0700 +Subject: [PATCH 6/7] do not define operator!= in C++20 + +A change to the semantics of equality operator rewriting in C++20 (P2468R2: The Equality Operator You Are Looking For) means that operator== may not be rewritten with reversed operands if operator!= is also defined. Since operator!= can normally be synthesized from operator== regardless in this language standard, we can and should avoid defining those when the new language semantics are available. + +This fixes the compilation of tests (and probably consuming code) in C++20 onwards for compilers that implement this new semantic, including recent nightly builds of clang-16. + +Reference: https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2468r2.html +--- + include/rapidjson/document.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index 46510f85..8b0446db 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -912,6 +912,7 @@ public: + */ + template RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr,internal::IsGenericValue >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); } + ++#ifndef __cpp_impl_three_way_comparison + //! Not-equal-to operator + /*! \return !(*this == rhs) + */ +@@ -926,7 +927,6 @@ public: + */ + template RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); } + +-#ifndef __cpp_impl_three_way_comparison + //! Equal-to operator with arbitrary types (symmetric version) + /*! \return (rhs == lhs) + */ +-- +2.43.0 + diff --git a/warzone2100.spec b/warzone2100.spec index b624860..6b09481 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -13,6 +13,20 @@ Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3 # https://github.com/Warzone2100/warzone2100/pull/3353 Patch0: warzone2100-pr3353-new-vulkan-header.patch +## rapidjson patches +# https://github.com/Tencent/rapidjson/pull/719 +Patch1001: 1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch +# https://github.com/Tencent/rapidjson/pull/719 +Patch1002: 1002-Explicitly-disable-copy-assignment-operator.patch +# https://github.com/Tencent/rapidjson/pull/1137 +Patch1003: 1003-Three-way-comparison-for-CLang-10-fix-1679.patch +# https://github.com/Tencent/rapidjson/pull/1679 +Patch1004: 1004-Fix-recursive-operator-call-in-C-20-1846.patch +# https://github.com/Tencent/rapidjson/pull/1847 +Patch1005: 1005-gate-definition-of-symmetric-equality-operators-on-i.patch +# https://github.com/Tencent/rapidjson/pull/2091 +Patch1006: 1006-do-not-define-operator-in-C-20.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -59,7 +73,12 @@ BuildArch: noarch Video file for %{name}. %prep -%autosetup -p1 -n warzone2100 +%autosetup -n warzone2100 -N +%autopatch -M 999 -p1 +# rapidjson patches +pushd 3rdparty/discord-rpc/thirdparty/rapidjson +%autopatch -m 1000 -p1 +popd # Don't use -Werror for distro builds sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt From bcf9595343b5de6d537b6fd6075b7fc9ba7934d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:07:42 +0000 Subject: [PATCH 66/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 6b09481..0a057d1 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA @@ -113,6 +113,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 4.3.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6cb62b32a8a5d4bf55fff8949894989eef5a2420 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 18 Aug 2024 23:43:43 +0100 Subject: [PATCH 67/82] Update to 4.5.2 (rhbz#2247216) --- ...iling-assignment-operator.-Fixed-718.patch | 25 -------- ...tly-disable-copy-assignment-operator.patch | 25 -------- ...way-comparison-for-CLang-10-fix-1679.patch | 50 --------------- ...recursive-operator-call-in-C-20-1846.patch | 32 ---------- ...of-symmetric-equality-operators-on-i.patch | 29 --------- 1006-do-not-define-operator-in-C-20.patch | 37 ----------- sources | 2 +- warzone2100-pr3353-new-vulkan-header.patch | 63 ------------------- warzone2100.spec | 31 ++------- 9 files changed, 6 insertions(+), 288 deletions(-) delete mode 100644 1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch delete mode 100644 1002-Explicitly-disable-copy-assignment-operator.patch delete mode 100644 1003-Three-way-comparison-for-CLang-10-fix-1679.patch delete mode 100644 1004-Fix-recursive-operator-call-in-C-20-1846.patch delete mode 100644 1005-gate-definition-of-symmetric-equality-operators-on-i.patch delete mode 100644 1006-do-not-define-operator-in-C-20.patch delete mode 100644 warzone2100-pr3353-new-vulkan-header.patch diff --git a/1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch b/1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch deleted file mode 100644 index a31737f..0000000 --- a/1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1257fe9096b70cc278f9d6e4029776b50df5d5cf Mon Sep 17 00:00:00 2001 -From: Janusz Chorko -Date: Fri, 26 Aug 2016 21:17:38 +0200 -Subject: [PATCH 1/7] Removed non-compiling assignment operator. Fixed #718 - ---- - include/rapidjson/document.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index e3e20dfb..b0f1f70b 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -316,8 +316,6 @@ struct GenericStringRef { - - GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} - -- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } -- - //! implicit conversion to plain CharType pointer - operator const Ch *() const { return s; } - --- -2.43.0 - diff --git a/1002-Explicitly-disable-copy-assignment-operator.patch b/1002-Explicitly-disable-copy-assignment-operator.patch deleted file mode 100644 index 54a514f..0000000 --- a/1002-Explicitly-disable-copy-assignment-operator.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f9d9e50caca4673f194115b059fe5daef77163fd Mon Sep 17 00:00:00 2001 -From: Janusz Chorko -Date: Fri, 26 Aug 2016 21:26:50 +0200 -Subject: [PATCH 2/7] Explicitly disable copy assignment operator - ---- - include/rapidjson/document.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index b0f1f70b..19f5a6a5 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -326,6 +326,8 @@ private: - //! Disallow construction from non-const array - template - GenericStringRef(CharType (&str)[N]) /* = delete */; -+ //! Copy assignment operator not permitted - immutable type -+ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */; - }; - - //! Mark a character pointer as constant string --- -2.43.0 - diff --git a/1003-Three-way-comparison-for-CLang-10-fix-1679.patch b/1003-Three-way-comparison-for-CLang-10-fix-1679.patch deleted file mode 100644 index 637463c..0000000 --- a/1003-Three-way-comparison-for-CLang-10-fix-1679.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2cecf24712bfe0f3d821a6f3763156066c7c40ec Mon Sep 17 00:00:00 2001 -From: Nikolay <211292+kolya7k@users.noreply.github.com> -Date: Mon, 30 Mar 2020 07:20:35 +0500 -Subject: [PATCH 3/7] Three-way comparison for CLang 10 fix (#1679) - -C++20 features must enable additional functionality, not to change interface completely ---- - include/rapidjson/document.h | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index 19f5a6a5..8e13d1cc 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -24,6 +24,9 @@ - #include "encodedstream.h" - #include // placement new - #include -+#ifdef __cpp_lib_three_way_comparison -+#include -+#endif - - RAPIDJSON_DIAG_PUSH - #ifdef _MSC_VER -@@ -168,12 +171,16 @@ public: - - //! @name relations - //@{ -- bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; } -- bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; } -- bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; } -- bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; } -- bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; } -- bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; } -+ template bool operator==(const GenericMemberIterator& that) const { return ptr_ == that.ptr_; } -+ template bool operator!=(const GenericMemberIterator& that) const { return ptr_ != that.ptr_; } -+ template bool operator<=(const GenericMemberIterator& that) const { return ptr_ <= that.ptr_; } -+ template bool operator>=(const GenericMemberIterator& that) const { return ptr_ >= that.ptr_; } -+ template bool operator< (const GenericMemberIterator& that) const { return ptr_ < that.ptr_; } -+ template bool operator> (const GenericMemberIterator& that) const { return ptr_ > that.ptr_; } -+ -+#ifdef __cpp_lib_three_way_comparison -+ template std::strong_ordering operator<=>(const GenericMemberIterator& that) const { return ptr_ <=> that.ptr_; } -+#endif - //@} - - //! @name dereference --- -2.43.0 - diff --git a/1004-Fix-recursive-operator-call-in-C-20-1846.patch b/1004-Fix-recursive-operator-call-in-C-20-1846.patch deleted file mode 100644 index 2aca216..0000000 --- a/1004-Fix-recursive-operator-call-in-C-20-1846.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 11a7270fabf0c39cca0771453ae8a5df42d58f42 Mon Sep 17 00:00:00 2001 -From: Laurent Stacul -Date: Mon, 22 Feb 2021 16:11:42 +0000 -Subject: [PATCH 4/7] Fix recursive operator== call in C++20 (#1846) - ---- - include/rapidjson/document.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index 8e13d1cc..3c354a79 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -926,6 +926,7 @@ public: - */ - template RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); } - -+#ifndef __cpp_lib_three_way_comparison - //! Equal-to operator with arbitrary types (symmetric version) - /*! \return (rhs == lhs) - */ -@@ -936,6 +937,7 @@ public: - */ - template friend RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); } - //@} -+#endif - - //!@name Type - //@{ --- -2.43.0 - diff --git a/1005-gate-definition-of-symmetric-equality-operators-on-i.patch b/1005-gate-definition-of-symmetric-equality-operators-on-i.patch deleted file mode 100644 index 886a5dc..0000000 --- a/1005-gate-definition-of-symmetric-equality-operators-on-i.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 424d1b95c7d95ac82f49bba82fdd05c29f73a2c1 Mon Sep 17 00:00:00 2001 -From: Kent Ross -Date: Mon, 14 Mar 2022 12:25:26 -0700 -Subject: [PATCH 5/7] gate definition of symmetric equality operators on impl, - not lib - -These operators call themselves recursively if C++20 semantics are present in the compiler, regardless of standard library support for the operator; therefore the test should be on __cpp_impl_three_way_comparison, not __cpp_lib_[...]. - -This fixes the Value.EqualtoOperator test when the language standard is set to C++20 and the standard library does not yet define the library support macro. ---- - include/rapidjson/document.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index 3c354a79..46510f85 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -926,7 +926,7 @@ public: - */ - template RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); } - --#ifndef __cpp_lib_three_way_comparison -+#ifndef __cpp_impl_three_way_comparison - //! Equal-to operator with arbitrary types (symmetric version) - /*! \return (rhs == lhs) - */ --- -2.43.0 - diff --git a/1006-do-not-define-operator-in-C-20.patch b/1006-do-not-define-operator-in-C-20.patch deleted file mode 100644 index 383c33a..0000000 --- a/1006-do-not-define-operator-in-C-20.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 42ca72bf3a161cf8d5e43f5d4f68aeeec3f7e6b4 Mon Sep 17 00:00:00 2001 -From: Kent Ross -Date: Thu, 3 Nov 2022 20:17:41 -0700 -Subject: [PATCH 6/7] do not define operator!= in C++20 - -A change to the semantics of equality operator rewriting in C++20 (P2468R2: The Equality Operator You Are Looking For) means that operator== may not be rewritten with reversed operands if operator!= is also defined. Since operator!= can normally be synthesized from operator== regardless in this language standard, we can and should avoid defining those when the new language semantics are available. - -This fixes the compilation of tests (and probably consuming code) in C++20 onwards for compilers that implement this new semantic, including recent nightly builds of clang-16. - -Reference: https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2468r2.html ---- - include/rapidjson/document.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h -index 46510f85..8b0446db 100644 ---- a/include/rapidjson/document.h -+++ b/include/rapidjson/document.h -@@ -912,6 +912,7 @@ public: - */ - template RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr,internal::IsGenericValue >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); } - -+#ifndef __cpp_impl_three_way_comparison - //! Not-equal-to operator - /*! \return !(*this == rhs) - */ -@@ -926,7 +927,6 @@ public: - */ - template RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); } - --#ifndef __cpp_impl_three_way_comparison - //! Equal-to operator with arbitrary types (symmetric version) - /*! \return (rhs == lhs) - */ --- -2.43.0 - diff --git a/sources b/sources index ab9f102..bb19548 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = ec65f22a0aad9fe482c4ea916cb321d171b10f0a9b181fea7db2eb17bf54e32b3828c8259082fff266713e2cab4e32dcc455d0d5b923a5ca221fc77b11137062 +SHA512 (warzone2100_src.tar.xz) = 09051396f84c0e358c0748fe25a27ab3a8801ddc9a8852e69ca81e6ceea9b81b41307639cf0cc2bf5851446b2086ccb5b279d2f8da05e719d533d07924bf20b9 diff --git a/warzone2100-pr3353-new-vulkan-header.patch b/warzone2100-pr3353-new-vulkan-header.patch deleted file mode 100644 index fc37ee5..0000000 --- a/warzone2100-pr3353-new-vulkan-header.patch +++ /dev/null @@ -1,63 +0,0 @@ -From cdac3fc02a210f249b5ff078ee180235f46f65a1 Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Sun, 25 Jun 2023 17:30:39 +0200 -Subject: [PATCH] [Vulkan] Fix the build with vulkan-header >= 1.3.260 - -Add detail:: namespace to throwResultException ---- - lib/ivis_opengl/gfx_api_vk.cpp | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp -index b89167bd96a..fa14d5bbaf7 100644 ---- a/lib/ivis_opengl/gfx_api_vk.cpp -+++ b/lib/ivis_opengl/gfx_api_vk.cpp -@@ -59,6 +59,12 @@ - #pragma GCC diagnostic ignored "-Wdeprecated-copy" // Ignore warnings caused by vulkan.hpp 148 - #endif - -+#if VK_HEADER_VERSION >= 260 -+# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::detail::throwResultException(result, message) -+#else -+# define WZ_THROW_VK_RESULT_EXCEPTION(result, message) vk::throwResultException(result, message) -+#endif -+ - const uint32_t minSupportedVulkanVersion = VK_API_VERSION_1_0; - #if defined(DEBUG) - // For debug builds, limit to the minimum that should be supported by this backend (which is Vulkan 1.0, see above) -@@ -549,7 +555,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t minimumSize) - if (result != vk::Result::eSuccess) - { - // Failed to allocate memory! -- vk::throwResultException( result, "vmaCreateBuffer" ); -+ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" ); - } - - if (autoMap) -@@ -1760,7 +1766,7 @@ VkPSO::VkPSO(vk::Device _dev, - object = std::move(result.value); - break; - default: -- vk::throwResultException(result.result, "createGraphicsPipeline"); -+ WZ_THROW_VK_RESULT_EXCEPTION(result.result, "createGraphicsPipeline"); - } - } - -@@ -1824,7 +1830,7 @@ void VkBuf::allocateBufferObject(const std::size_t& size) - if (result != vk::Result::eSuccess) - { - // Failed to allocate memory! -- vk::throwResultException( result, "vmaCreateBuffer" ); -+ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateBuffer" ); - } - - buffer_size = size; -@@ -1966,7 +1972,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::size_t& mipmap_count, const - if (result != vk::Result::eSuccess) - { - // Failed to allocate memory! -- vk::throwResultException( result, "vmaCreateImage" ); -+ WZ_THROW_VK_RESULT_EXCEPTION( result, "vmaCreateImage" ); - } - - if (root.debugUtilsExtEnabled) diff --git a/warzone2100.spec b/warzone2100.spec index 0a057d1..6d3b9b8 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,30 +2,14 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.3.5 -Release: 6%{?dist} +Version: 4.5.2 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy License: GPLv2+ and CC-BY-SA URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz -# https://github.com/Warzone2100/warzone2100/pull/3353 -Patch0: warzone2100-pr3353-new-vulkan-header.patch - -## rapidjson patches -# https://github.com/Tencent/rapidjson/pull/719 -Patch1001: 1001-Removed-non-compiling-assignment-operator.-Fixed-718.patch -# https://github.com/Tencent/rapidjson/pull/719 -Patch1002: 1002-Explicitly-disable-copy-assignment-operator.patch -# https://github.com/Tencent/rapidjson/pull/1137 -Patch1003: 1003-Three-way-comparison-for-CLang-10-fix-1679.patch -# https://github.com/Tencent/rapidjson/pull/1679 -Patch1004: 1004-Fix-recursive-operator-call-in-C-20-1846.patch -# https://github.com/Tencent/rapidjson/pull/1847 -Patch1005: 1005-gate-definition-of-symmetric-equality-operators-on-i.patch -# https://github.com/Tencent/rapidjson/pull/2091 -Patch1006: 1006-do-not-define-operator-in-C-20.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -73,12 +57,7 @@ BuildArch: noarch Video file for %{name}. %prep -%autosetup -n warzone2100 -N -%autopatch -M 999 -p1 -# rapidjson patches -pushd 3rdparty/discord-rpc/thirdparty/rapidjson -%autopatch -m 1000 -p1 -popd +%autosetup -n warzone2100 -p1 # Don't use -Werror for distro builds sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt @@ -90,7 +69,7 @@ sed -i -e '/^CONFIGURE_WZ_COMPILER_WARNINGS()$/d' CMakeLists.txt %install %cmake_install rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} -%find_lang %{name} +%find_lang %{name} --all-name install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/warzone2100/sequences.wz # Fix icon install path @@ -104,7 +83,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_bindir}/warzone2100 %{_datadir}/applications/net.wz2100.warzone2100.desktop %{_datadir}/icons/hicolor/128x128/apps/net.wz2100.warzone2100.png -%{_datadir}/metainfo/net.wz2100.warzone2100.appdata.xml +%{_datadir}/metainfo/net.wz2100.warzone2100.metainfo.xml %{_datadir}/warzone2100/ %exclude %{_datadir}/warzone2100/sequences.wz %{_mandir}/man6/warzone2100.6* From 087ab02e32a9ec332294da2898dab910535a7aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:45:39 +0200 Subject: [PATCH 68/82] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- warzone2100.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index 6d3b9b8..fa0dbee 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,10 +3,11 @@ Name: warzone2100 Version: 4.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy -License: GPLv2+ and CC-BY-SA +# Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. +License: GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz @@ -92,6 +93,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Wed Sep 4 2024 Miroslav Suchý - 4.5.2-2 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.3.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6a4730d41dd2608d39ec5b67405aa917defd92bc Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 2 Oct 2024 10:25:28 +0100 Subject: [PATCH 69/82] Update to 4.5.3 (rhbz#2312053) --- sources | 2 +- warzone2100.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index bb19548..2b4166f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = 09051396f84c0e358c0748fe25a27ab3a8801ddc9a8852e69ca81e6ceea9b81b41307639cf0cc2bf5851446b2086ccb5b279d2f8da05e719d533d07924bf20b9 +SHA512 (warzone2100_src.tar.xz) = 1c73d8ec35c91b16bfcb1c6a17dbb34c8baa45d0f5e6e14212692aaf8166c2bd4e5137dfbbaa3bb6f27f82ec58efa8869f15c345a2f18cfa48a78a175e4bb258 diff --git a/warzone2100.spec b/warzone2100.spec index fa0dbee..c55592d 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,8 +2,8 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.5.2 -Release: 2%{?dist} +Version: 4.5.3 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. @@ -93,6 +93,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Wed Oct 02 2024 Pete Walter - 4.5.3-1 +- Update to 4.5.3 (rhbz#2312053) + * Wed Sep 4 2024 Miroslav Suchý - 4.5.2-2 - convert license to SPDX From c0c22da93e96411444a3a58a159683bd7db9e64c Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 14 Jan 2025 17:47:21 +0000 Subject: [PATCH 70/82] Update to 4.5.5 (rhbz#2324276) --- sources | 2 +- warzone2100.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2b4166f..30c27a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = 1c73d8ec35c91b16bfcb1c6a17dbb34c8baa45d0f5e6e14212692aaf8166c2bd4e5137dfbbaa3bb6f27f82ec58efa8869f15c345a2f18cfa48a78a175e4bb258 +SHA512 (warzone2100_src.tar.xz) = b153306ea8a55334a37580c2862579f6b6a283ba3c082901fcb97fe4da3a6ae4b7bc9bd7c1fa33f39a3b5113876080b90422174f376a7ed148a18f21f57ee8b3 diff --git a/warzone2100.spec b/warzone2100.spec index c55592d..4b62833 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,7 +2,7 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.5.3 +Version: 4.5.5 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -93,6 +93,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Tue Jan 14 2025 Pete Walter - 4.5.5-1 +- Update to 4.5.5 (rhbz#2324276) + * Wed Oct 02 2024 Pete Walter - 4.5.3-1 - Update to 4.5.3 (rhbz#2312053) From c1e0cec363108dd1dc6989865129e8486a193d21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:45:37 +0000 Subject: [PATCH 71/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 4b62833..8cbe447 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. @@ -93,6 +93,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 14 2025 Pete Walter - 4.5.5-1 - Update to 4.5.5 (rhbz#2324276) From 3ef89fe71fd3533e8f6d5d31ca6c6916cf6890c9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 10 Mar 2025 22:24:18 -0400 Subject: [PATCH 72/82] Fix build with GCC 15 https://github.com/SRombauts/SQLiteCpp/pull/488 --- SQLiteCPP-gcc15.patch | 35 +++++++++++++++++++++++++++++++++++ warzone2100.spec | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 SQLiteCPP-gcc15.patch diff --git a/SQLiteCPP-gcc15.patch b/SQLiteCPP-gcc15.patch new file mode 100644 index 0000000..1e13941 --- /dev/null +++ b/SQLiteCPP-gcc15.patch @@ -0,0 +1,35 @@ +From a4287a72e12ff64aec2b6cc418a3726bb1a4b7a4 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sat, 7 Sep 2024 14:31:27 +0100 +Subject: [PATCH] SQLiteCpp/Statement.h: add missing `` include + +Without the change the build fails on `gcc-15` as: + + [ 5%] Building CXX object CMakeFiles/SQLiteCpp.dir/src/Backup.cpp.o + In file included from /build/source/include/SQLiteCpp/Column.h:14, + from /build/source/include/SQLiteCpp/Database.h:14, + from /build/source/include/SQLiteCpp/Backup.h:15, + from /build/source/src/Backup.cpp:12: + /build/source/include/SQLiteCpp/Statement.h:132:39: error: 'uint32_t' does not name a type + 132 | void bind(const int aIndex, const uint32_t aValue); + | ^~~~~~~~ + /build/source/include/SQLiteCpp/Statement.h:20:1: note: 'uint32_t' is defined in header ''; this is probably fixable by adding '#include ' + 19 | #include + +++ |+#include + 20 | +--- + include/SQLiteCpp/Statement.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/SQLiteCpp/Statement.h b/include/SQLiteCpp/Statement.h +index bb62a9f9..2f3adf7d 100644 +--- a/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h ++++ b/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h +@@ -14,6 +14,7 @@ + #include + #include // SQLITECPP_PURE_FUNC + ++#include + #include + #include + #include diff --git a/warzone2100.spec b/warzone2100.spec index 8cbe447..3c18ab4 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -12,6 +12,8 @@ URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz +Patch0: SQLiteCPP-gcc15.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From e2ce51996d37755ca298a9cd5f09cabb57a20e79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:17:30 +0000 Subject: [PATCH 73/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 3c18ab4..18baaa3 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.5.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. @@ -95,6 +95,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.5.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a267a28b39ac6399410e6f0d260e05bbdb410e7d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 14 Aug 2025 08:08:05 -0500 Subject: [PATCH 74/82] Fix FTBFS --- cmake4.patch | 521 +++++++++++++++++++++++++++++++++++++++++++++++ warzone2100.spec | 1 + 2 files changed, 522 insertions(+) create mode 100644 cmake4.patch diff --git a/cmake4.patch b/cmake4.patch new file mode 100644 index 0000000..1075dc4 --- /dev/null +++ b/cmake4.patch @@ -0,0 +1,521 @@ +diff -U3 -r warzone2100.old/3rdparty/basis_universal/CMakeLists.txt warzone2100/3rdparty/basis_universal/CMakeLists.txt +--- warzone2100.old/3rdparty/basis_universal/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 ++++ warzone2100/3rdparty/basis_universal/CMakeLists.txt 2025-08-13 14:49:48.825317535 -0500 +@@ -1,6 +1,6 @@ + project(basisu) + +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.12...4.0) + option(STATIC "static linking" FALSE) + option(SAN "sanitize" FALSE) + +diff -U3 -r warzone2100.old/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt warzone2100/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt +--- warzone2100.old/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 ++++ warzone2100/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt 2025-08-13 14:49:48.825112521 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(basisu_encoder_js) + +diff -U3 -r warzone2100.old/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt warzone2100/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt +--- warzone2100.old/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 ++++ warzone2100/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt 2025-08-13 14:49:48.824916527 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(basisu_transcoder_js) + +diff -U3 -r warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt +--- warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt 2025-08-13 14:49:48.827655139 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + project(basis_universal_host_build_wrapper) + + set(BASIS_UNIVERSAL_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../basis_universal") +diff -U3 -r warzone2100.old/3rdparty/CMakeLists.txt warzone2100/3rdparty/CMakeLists.txt +--- warzone2100.old/3rdparty/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/3rdparty/CMakeLists.txt 2025-08-13 14:49:48.827852856 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5...3.24) ++cmake_minimum_required(VERSION 3.12...4.0) + + include(CheckCompilerFlagsOutput) + +diff -U3 -r warzone2100.old/3rdparty/date/CMakeLists.txt warzone2100/3rdparty/date/CMakeLists.txt +--- warzone2100.old/3rdparty/date/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 ++++ warzone2100/3rdparty/date/CMakeLists.txt 2025-08-13 14:49:48.826956569 -0500 +@@ -15,7 +15,7 @@ + + #]===================================================================] + +-cmake_minimum_required( VERSION 3.7 ) ++cmake_minimum_required(VERSION 3.12...4.0) + + project( date VERSION 3.0.1 ) + set(ABI_VERSION 3) # used as SOVERSION, increment when ABI changes +diff -U3 -r warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt warzone2100/3rdparty/discord-rpc/CMakeLists.txt +--- warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 ++++ warzone2100/3rdparty/discord-rpc/CMakeLists.txt 2025-08-13 14:49:48.822365594 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.2...3.14) ++cmake_minimum_required(VERSION 3.12...4.0) + project (DiscordRPC) + + include(GNUInstallDirs) +diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2024-11-13 13:54:54.000000000 -0600 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2025-08-13 14:49:48.823698588 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.12...4.0) + + if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2025-08-13 14:49:48.823017794 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6.4) ++cmake_minimum_required(VERSION 3.12...4.0) + + if (POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) +diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2025-08-13 14:49:48.822648901 -0500 +@@ -43,7 +43,7 @@ + cmake_policy(SET CMP0048 NEW) + project(gmock VERSION 1.9.0 LANGUAGES CXX C) + endif() +-cmake_minimum_required(VERSION 2.6.4) ++cmake_minimum_required(VERSION 3.12...4.0) + + if (COMMAND set_up_hermetic_build) + set_up_hermetic_build() +diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2025-08-13 14:49:48.823285576 -0500 +@@ -50,7 +50,7 @@ + cmake_policy(SET CMP0048 NEW) + project(gtest VERSION 1.9.0 LANGUAGES CXX C) + endif() +-cmake_minimum_required(VERSION 2.6.4) ++cmake_minimum_required(VERSION 3.12...4.0) + + if (POLICY CMP0063) # Visibility + cmake_policy(SET CMP0063 NEW) +diff -U3 -r warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt +--- warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600 ++++ warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2025-08-13 14:49:48.828146769 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +diff -U3 -r warzone2100.old/3rdparty/expected/CMakeLists.txt warzone2100/3rdparty/expected/CMakeLists.txt +--- warzone2100.old/3rdparty/expected/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/expected/CMakeLists.txt 2025-08-13 14:49:48.824170255 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.14) ++cmake_minimum_required(VERSION 3.12...4.0) + project(tl-expected + HOMEPAGE_URL https://tl.tartanllama.xyz + DESCRIPTION "C++11/14/17 std::expected with functional-style extensions" +diff -U3 -r warzone2100.old/3rdparty/fmt/CMakeLists.txt warzone2100/3rdparty/fmt/CMakeLists.txt +--- warzone2100.old/3rdparty/fmt/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/fmt/CMakeLists.txt 2025-08-13 14:49:48.826660907 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.8...3.26) ++cmake_minimum_required(VERSION 3.12...4.0) + + # Fallback for using newer policies on CMake <3.12. + if (${CMAKE_VERSION} VERSION_LESS 3.12) +diff -U3 -r warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt +--- warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2025-08-13 14:49:48.826180621 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.8...3.25) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(fmt-test CXX) + +diff -U3 -r warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt +--- warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2025-08-13 14:49:48.825980269 -0500 +@@ -1,6 +1,6 @@ + # Test if compile errors are produced where necessary. + +-cmake_minimum_required(VERSION 3.8...3.25) ++cmake_minimum_required(VERSION 3.12...4.0) + project(compile-error-test CXX) + + set(fmt_headers " +@@ -64,7 +64,7 @@ + ") + + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test/CMakeLists.txt" " +- cmake_minimum_required(VERSION 3.8...3.25) ++cmake_minimum_required(VERSION 3.12...4.0) + project(tests CXX) + add_subdirectory(${FMT_DIR} fmt) + ${cmake_targets} +diff -U3 -r warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt +--- warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2025-08-13 14:49:48.825763077 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.8...3.25) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(fmt-test) + +diff -U3 -r warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt +--- warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2025-08-13 14:49:48.826355603 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.8...3.25) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(fmt-link CXX) + +diff -U3 -r warzone2100.old/3rdparty/glm/CMakeLists.txt warzone2100/3rdparty/glm/CMakeLists.txt +--- warzone2100.old/3rdparty/glm/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/glm/CMakeLists.txt 2025-08-13 14:49:48.827382757 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.12...4.0) + cmake_policy(VERSION 3.6) + + file(READ "glm/detail/setup.hpp" GLM_SETUP_FILE) +diff -U3 -r warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt +--- warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt 2025-08-13 14:49:48.827186410 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.12...4.0) + cmake_policy(VERSION 3.6) + project(test_find_glm) + +diff -U3 -r warzone2100.old/3rdparty/json/CMakeLists.txt warzone2100/3rdparty/json/CMakeLists.txt +--- warzone2100.old/3rdparty/json/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/3rdparty/json/CMakeLists.txt 2025-08-13 14:49:48.823963491 -0500 +@@ -1,6 +1,6 @@ + # A simplified version of: https://github.com/nlohmann/json/blob/b21c34517900c46a943c804d9af3a20cd0c77062/CMakeLists.txt + +-cmake_minimum_required(VERSION 3.1...3.14) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(nlohmann_json LANGUAGES CXX) + +diff -U3 -r warzone2100.old/3rdparty/launchinfo/CMakeLists.txt warzone2100/3rdparty/launchinfo/CMakeLists.txt +--- warzone2100.old/3rdparty/launchinfo/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/launchinfo/CMakeLists.txt 2025-08-13 14:49:48.830539650 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + project (launchinfo C CXX) + + file(GLOB HEADERS "include/LaunchInfo.h") +diff -U3 -r warzone2100.old/3rdparty/libplum/CMakeLists.txt warzone2100/3rdparty/libplum/CMakeLists.txt +--- warzone2100.old/3rdparty/libplum/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/libplum/CMakeLists.txt 2025-08-13 14:49:48.830345294 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.7) ++cmake_minimum_required(VERSION 3.12...4.0) + project (libplum + VERSION 0.4.0 + LANGUAGES C) +diff -U3 -r warzone2100.old/3rdparty/optional-lite/CMakeLists.txt warzone2100/3rdparty/optional-lite/CMakeLists.txt +--- warzone2100.old/3rdparty/optional-lite/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/3rdparty/optional-lite/CMakeLists.txt 2025-08-13 14:49:48.825564157 -0500 +@@ -1,6 +1,6 @@ + # A very simple version of: https://github.com/martinmoene/optional-lite/blob/master/CMakeLists.txt + +-cmake_minimum_required(VERSION 3.5...3.24) ++cmake_minimum_required(VERSION 3.12...4.0) + + project( + optional_lite +diff -U3 -r warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt warzone2100/3rdparty/quickjs-wz/CMakeLists.txt +--- warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/quickjs-wz/CMakeLists.txt 2025-08-13 14:49:48.824391310 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5...3.14) ++cmake_minimum_required(VERSION 3.12...4.0) + project (quickjs C) + + if(${CMAKE_VERSION} VERSION_LESS 3.12) +diff -U3 -r warzone2100.old/3rdparty/re2/CMakeLists.txt warzone2100/3rdparty/re2/CMakeLists.txt +--- warzone2100.old/3rdparty/re2/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/re2/CMakeLists.txt 2025-08-13 14:49:48.822044500 -0500 +@@ -4,7 +4,7 @@ + + # Old enough to support Ubuntu Bionic, + # but just the MAJOR.MINOR components. +-cmake_minimum_required(VERSION 3.10) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(RE2 CXX) + include(CMakePackageConfigHelpers) +diff -U3 -r warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt +--- warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt 2025-08-13 14:49:48.828316645 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.9) ++cmake_minimum_required(VERSION 3.12...4.0) + project(readerwriterqueue VERSION 1.0.0) + + include(GNUInstallDirs) +diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt +--- warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600 ++++ warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt 2025-08-13 14:49:48.829206089 -0500 +@@ -4,7 +4,7 @@ + # + # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt + # or copy at http://opensource.org/licenses/MIT) +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # custom CMake modules like FindSQLiteCpp + project(SQLiteCpp VERSION 3.3.1) + +diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt +--- warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600 ++++ warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-08-13 14:49:48.829010729 -0500 +@@ -4,7 +4,7 @@ + # + # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt + # or copy at http://opensource.org/licenses/MIT) +-cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version ++cmake_minimum_required(VERSION 3.12...4.0) + project(SQLiteCpp_Example VERSION 2.0) + + # SQLiteC++ 3.x now requires C++11 compiler +diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/CMakeLists.txt +--- warzone2100.old/3rdparty/SQLiteCpp/googletest/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600 ++++ warzone2100/3rdparty/SQLiteCpp/googletest/CMakeLists.txt 2025-08-13 14:49:48.829897152 -0500 +@@ -1,7 +1,7 @@ + # Note: CMake support is community-based. The maintainers do not use CMake + # internally. + +-cmake_minimum_required(VERSION 3.13) ++cmake_minimum_required(VERSION 3.12...4.0) + + project(googletest-distribution) + set(GOOGLETEST_VERSION 1.14.0) +diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt +--- warzone2100.old/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600 ++++ warzone2100/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt 2025-08-13 14:49:48.829669555 -0500 +@@ -36,7 +36,7 @@ + # as ${gmock_SOURCE_DIR} and to the root binary directory as + # ${gmock_BINARY_DIR}. + # Language "C" is required for find_package(Threads). +-cmake_minimum_required(VERSION 3.13) ++cmake_minimum_required(VERSION 3.12...4.0) + project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) + + if (COMMAND set_up_hermetic_build) +diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt +--- warzone2100.old/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600 ++++ warzone2100/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt 2025-08-13 14:49:48.830060677 -0500 +@@ -46,7 +46,7 @@ + + # Project version: + +-cmake_minimum_required(VERSION 3.13) ++cmake_minimum_required(VERSION 3.12...4.0) + project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) + + if (COMMAND set_up_hermetic_build) +diff -U3 -r warzone2100.old/3rdparty/utf8proc/CMakeLists.txt warzone2100/3rdparty/utf8proc/CMakeLists.txt +--- warzone2100.old/3rdparty/utf8proc/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/utf8proc/CMakeLists.txt 2025-08-13 14:49:48.824650163 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + + include (utils.cmake) + +diff -U3 -r warzone2100.old/3rdparty/utfcpp/CMakeLists.txt warzone2100/3rdparty/utfcpp/CMakeLists.txt +--- warzone2100.old/3rdparty/utfcpp/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/utfcpp/CMakeLists.txt 2025-08-13 14:49:48.828870000 -0500 +@@ -1,7 +1,7 @@ + # This file is deprecated and will be removed in a future release + # Please see the instructions for installation in README.md file + +-cmake_minimum_required (VERSION 3.14...3.27) ++cmake_minimum_required(VERSION 3.12...4.0) + project (utf8cpp + VERSION 4.0.4 + LANGUAGES CXX +diff -U3 -r warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt +--- warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-08-13 14:49:48.828480707 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.0.2) ++cmake_minimum_required(VERSION 3.12...4.0) + project (ftest VERSION 0.0.1 LANGUAGES CXX) + + enable_testing() +diff -U3 -r warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt +--- warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt 2025-08-13 14:49:48.828685840 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + project(utfcpptests LANGUAGES CXX) + enable_testing() + +diff -U3 -r warzone2100.old/build_tools/CMakeLists.txt warzone2100/build_tools/CMakeLists.txt +--- warzone2100.old/build_tools/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/build_tools/CMakeLists.txt 2025-08-13 14:49:48.832806206 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5...3.24) ++cmake_minimum_required(VERSION 3.12...4.0) + + ############################ + # Versioning (autorevision) +diff -U3 -r warzone2100.old/CMakeLists.txt warzone2100/CMakeLists.txt +--- warzone2100.old/CMakeLists.txt 2025-08-13 14:48:22.252967002 -0500 ++++ warzone2100/CMakeLists.txt 2025-08-13 14:49:48.832964528 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5...3.24) ++cmake_minimum_required(VERSION 3.12...4.0) + + set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}") + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +diff -U3 -r warzone2100.old/data/fonts/CMakeLists.txt warzone2100/data/fonts/CMakeLists.txt +--- warzone2100.old/data/fonts/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 ++++ warzone2100/data/fonts/CMakeLists.txt 2025-08-13 14:49:48.831038582 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5) ++cmake_minimum_required(VERSION 3.12...4.0) + + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/DejaVu/LICENSE" +diff -U3 -r warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt +--- warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600 ++++ warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2025-08-13 14:49:48.831256841 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.14 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.12...4.0) + + project (miniupnpc + VERSION 2.2.8 +diff -U3 -r warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt +--- warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600 ++++ warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt 2025-08-13 14:49:48.831857223 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.16) ++cmake_minimum_required(VERSION 3.12...4.0) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") + +diff -U3 -r warzone2100.old/lib/wzmaplib/CMakeLists.txt warzone2100/lib/wzmaplib/CMakeLists.txt +--- warzone2100.old/lib/wzmaplib/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/lib/wzmaplib/CMakeLists.txt 2025-08-13 14:49:48.831615733 -0500 +@@ -22,7 +22,7 @@ + ############################## + # wzmaplib project + +-cmake_minimum_required(VERSION ${_cmake_min_ver_supported}...3.24) ++cmake_minimum_required(VERSION 3.12...4.0) + project (wzmaplib CXX) + + if(${CMAKE_VERSION} VERSION_LESS 3.12) +diff -U3 -r warzone2100.old/po/CMakeLists.txt warzone2100/po/CMakeLists.txt +--- warzone2100.old/po/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/po/CMakeLists.txt 2025-08-13 14:49:48.830713731 -0500 +@@ -15,7 +15,7 @@ + # CMake 3.10+ at the top of this file leads to an inability to compile via + # Visual Studio itself. + # +- # Instead of using cmake_minimum_required(VERSION 3.10), detect the ++cmake_minimum_required(VERSION 3.12...4.0) + # CMake version and emit a warning if it's below 3.10. + # + if(${CMAKE_VERSION} VERSION_LESS "3.10.0") +diff -U3 -r warzone2100.old/src/integrations/CMakeLists.txt warzone2100/src/integrations/CMakeLists.txt +--- warzone2100.old/src/integrations/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/src/integrations/CMakeLists.txt 2025-08-13 14:49:48.832121148 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5...3.24) ++cmake_minimum_required(VERSION 3.12...4.0) + + ################################################## + # WZ Discord RPC support +diff -U3 -r warzone2100.old/tools/map/old/CMakeLists.txt warzone2100/tools/map/old/CMakeLists.txt +--- warzone2100.old/tools/map/old/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/tools/map/old/CMakeLists.txt 2025-08-13 14:49:48.832305121 -0500 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required(VERSION 3.12...4.0) + + project (maptools) + +diff -U3 -r warzone2100.old/tools/maptools-cli/CMakeLists.txt warzone2100/tools/maptools-cli/CMakeLists.txt +--- warzone2100.old/tools/maptools-cli/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600 ++++ warzone2100/tools/maptools-cli/CMakeLists.txt 2025-08-13 14:49:48.832560376 -0500 +@@ -7,7 +7,7 @@ + set(_cmake_min_ver_supported 3.11) # CMake 3.11 is the minimum version for FetchContent + endif() + +-cmake_minimum_required(VERSION ${_cmake_min_ver_supported}...3.14) ++cmake_minimum_required(VERSION 3.12...4.0) + + set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}") + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +--- warzone2100/doc/CMakeLists.txt~ 2024-11-13 13:54:24.000000000 -0600 ++++ warzone2100/doc/CMakeLists.txt 2025-08-13 15:12:41.371983496 -0500 +@@ -16,6 +16,7 @@ + COMMAND ${CMAKE_COMMAND} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/GenerateJSDocs.cmake + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + VERBATIM ++ POST_BUILD + ) + + configure_file(Scripting.md "${CMAKE_CURRENT_BINARY_DIR}/Scripting.md" COPYONLY) +--- warzone2100/doc/CMakeLists.txt~ 2025-08-13 15:23:14.837051821 -0500 ++++ warzone2100/doc/CMakeLists.txt 2025-08-13 15:25:02.458759347 -0500 +@@ -131,6 +131,7 @@ + -a toc + ${CMAKE_CURRENT_BINARY_DIR}/quickstartguide.asciidoc + VERBATIM ++ POST_BUILD + ) + + configure_file("warzone2100.6.asciidoc" "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc" COPYONLY) +@@ -146,6 +147,7 @@ + -D ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc + VERBATIM ++ POST_BUILD + ) + + # warzone2100.6 - man-page format +@@ -160,6 +162,7 @@ + -o warzone2100.6 + ${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc + VERBATIM ++ POST_BUILD + ) + + unset(_asciidoctor_option_failurelevel) +@@ -270,12 +273,14 @@ + COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}" + COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} + VERBATIM ++ POST_BUILD + ) + else() + add_custom_command( + TARGET wz2100_manpages + COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} + VERBATIM ++ POST_BUILD + ) + endif() + diff --git a/warzone2100.spec b/warzone2100.spec index 18baaa3..4a01601 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -13,6 +13,7 @@ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{v Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz Patch0: SQLiteCPP-gcc15.patch +Patch1: cmake4.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From d959a3440a5461aea601920b38d5cf25b6b9643f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 11 Nov 2025 16:22:15 -0600 Subject: [PATCH 75/82] 4.6.1 --- cmake4.patch | 487 +++++++++++++++++++++-------------------------- sources | 2 +- warzone2100.spec | 12 +- 3 files changed, 226 insertions(+), 275 deletions(-) diff --git a/cmake4.patch b/cmake4.patch index 1075dc4..95bc503 100644 --- a/cmake4.patch +++ b/cmake4.patch @@ -1,157 +1,139 @@ diff -U3 -r warzone2100.old/3rdparty/basis_universal/CMakeLists.txt warzone2100/3rdparty/basis_universal/CMakeLists.txt ---- warzone2100.old/3rdparty/basis_universal/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 -+++ warzone2100/3rdparty/basis_universal/CMakeLists.txt 2025-08-13 14:49:48.825317535 -0500 +--- warzone2100.old/3rdparty/basis_universal/CMakeLists.txt 2025-09-16 11:43:01.000000000 -0500 ++++ warzone2100/3rdparty/basis_universal/CMakeLists.txt 2025-11-11 13:15:40.969955726 -0600 @@ -1,6 +1,6 @@ - project(basisu) - --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.12...4.0) - option(STATIC "static linking" FALSE) - option(SAN "sanitize" FALSE) - -diff -U3 -r warzone2100.old/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt warzone2100/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt ---- warzone2100.old/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 -+++ warzone2100/3rdparty/basis_universal/webgl/encoder/CMakeLists.txt 2025-08-13 14:49:48.825112521 -0500 -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.12...4.0) - - project(basisu_encoder_js) - -diff -U3 -r warzone2100.old/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt warzone2100/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt ---- warzone2100.old/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 -+++ warzone2100/3rdparty/basis_universal/webgl/transcoder/CMakeLists.txt 2025-08-13 14:49:48.824916527 -0500 -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.12...4.0) - - project(basisu_transcoder_js) - -diff -U3 -r warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt ---- warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt 2025-08-13 14:49:48.827655139 -0500 -@@ -1,4 +1,4 @@ + # Important: The Basis Universal encoder and transcoder libraries must be compiled with -fno-strict-aliasing (MSVC's default, and also the Linux kernel). + # It should also work without this option, but we do not test with it. -cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) + + project(basisu) + option(STATIC "static linking" FALSE) +diff -U3 -r warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt +--- warzone2100.old/3rdparty/basis_universal_host_build/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/3rdparty/basis_universal_host_build/CMakeLists.txt 2025-11-11 13:15:40.980348748 -0600 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) project(basis_universal_host_build_wrapper) set(BASIS_UNIVERSAL_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../basis_universal") diff -U3 -r warzone2100.old/3rdparty/CMakeLists.txt warzone2100/3rdparty/CMakeLists.txt ---- warzone2100.old/3rdparty/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/3rdparty/CMakeLists.txt 2025-08-13 14:49:48.827852856 -0500 +--- warzone2100.old/3rdparty/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/3rdparty/CMakeLists.txt 2025-11-11 13:15:40.971048267 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.5...3.24) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required (VERSION 3.16...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) include(CheckCompilerFlagsOutput) diff -U3 -r warzone2100.old/3rdparty/date/CMakeLists.txt warzone2100/3rdparty/date/CMakeLists.txt ---- warzone2100.old/3rdparty/date/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 -+++ warzone2100/3rdparty/date/CMakeLists.txt 2025-08-13 14:49:48.826956569 -0500 +--- warzone2100.old/3rdparty/date/CMakeLists.txt 2025-09-16 11:43:01.000000000 -0500 ++++ warzone2100/3rdparty/date/CMakeLists.txt 2025-11-11 13:15:40.979193010 -0600 @@ -15,7 +15,7 @@ #]===================================================================] -cmake_minimum_required( VERSION 3.7 ) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) - project( date VERSION 3.0.1 ) + project( date VERSION 3.0.4 ) set(ABI_VERSION 3) # used as SOVERSION, increment when ABI changes diff -U3 -r warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt warzone2100/3rdparty/discord-rpc/CMakeLists.txt ---- warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt 2024-11-13 13:54:52.000000000 -0600 -+++ warzone2100/3rdparty/discord-rpc/CMakeLists.txt 2025-08-13 14:49:48.822365594 -0500 +--- warzone2100.old/3rdparty/discord-rpc/CMakeLists.txt 2025-09-16 11:43:01.000000000 -0500 ++++ warzone2100/3rdparty/discord-rpc/CMakeLists.txt 2025-11-11 13:15:40.973974804 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2...3.14) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project (DiscordRPC) include(GNUInstallDirs) diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt ---- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2024-11-13 13:54:54.000000000 -0600 -+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2025-08-13 14:49:48.823698588 -0500 +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2025-09-16 11:43:03.000000000 -0500 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/example/CMakeLists.txt 2025-11-11 13:15:40.973728553 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) if(POLICY CMP0054) cmake_policy(SET CMP0054 NEW) diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt ---- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600 -+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2025-08-13 14:49:48.823017794 -0500 +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/CMakeLists.txt 2025-11-11 13:15:40.971423408 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) if (POLICY CMP0048) cmake_policy(SET CMP0048 NEW) diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt ---- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600 -+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2025-08-13 14:49:48.822648901 -0500 +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googlemock/CMakeLists.txt 2025-11-11 13:15:40.971643490 -0600 @@ -43,7 +43,7 @@ cmake_policy(SET CMP0048 NEW) project(gmock VERSION 1.9.0 LANGUAGES CXX C) endif() -cmake_minimum_required(VERSION 2.6.4) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) if (COMMAND set_up_hermetic_build) set_up_hermetic_build() diff -U3 -r warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt ---- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2024-11-13 13:54:55.000000000 -0600 -+++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2025-08-13 14:49:48.823285576 -0500 +--- warzone2100.old/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/discord-rpc/thirdparty/rapidjson/thirdparty/gtest/googletest/CMakeLists.txt 2025-11-11 13:15:40.972078077 -0600 @@ -50,7 +50,7 @@ cmake_policy(SET CMP0048 NEW) project(gtest VERSION 1.9.0 LANGUAGES CXX C) endif() -cmake_minimum_required(VERSION 2.6.4) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) if (POLICY CMP0063) # Visibility cmake_policy(SET CMP0063 NEW) diff -U3 -r warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt ---- warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600 -+++ warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2025-08-13 14:49:48.828146769 -0500 +--- warzone2100.old/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2025-09-16 11:42:25.000000000 -0500 ++++ warzone2100/3rdparty/EmbeddedJSONSignature/CMakeLists.txt 2025-11-11 13:15:40.969719514 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required (VERSION 3.5...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff -U3 -r warzone2100.old/3rdparty/expected/CMakeLists.txt warzone2100/3rdparty/expected/CMakeLists.txt ---- warzone2100.old/3rdparty/expected/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/expected/CMakeLists.txt 2025-08-13 14:49:48.824170255 -0500 +--- warzone2100.old/3rdparty/expected/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/expected/CMakeLists.txt 2025-11-11 13:15:40.981945460 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(tl-expected HOMEPAGE_URL https://tl.tartanllama.xyz DESCRIPTION "C++11/14/17 std::expected with functional-style extensions" diff -U3 -r warzone2100.old/3rdparty/fmt/CMakeLists.txt warzone2100/3rdparty/fmt/CMakeLists.txt ---- warzone2100.old/3rdparty/fmt/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/fmt/CMakeLists.txt 2025-08-13 14:49:48.826660907 -0500 +--- warzone2100.old/3rdparty/fmt/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/fmt/CMakeLists.txt 2025-11-11 13:15:40.976616850 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.8...3.26) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.8...3.28) ++cmake_minimum_required(VERSION 3.10...4.0) # Fallback for using newer policies on CMake <3.12. if (${CMAKE_VERSION} VERSION_LESS 3.12) diff -U3 -r warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt ---- warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2025-08-13 14:49:48.826180621 -0500 +--- warzone2100.old/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/fmt/test/add-subdirectory-test/CMakeLists.txt 2025-11-11 13:15:40.978473268 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8...3.25) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(fmt-test CXX) diff -U3 -r warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt ---- warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2025-08-13 14:49:48.825980269 -0500 +--- warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/fmt/test/compile-error-test/CMakeLists.txt 2025-11-11 13:15:40.977741731 -0600 @@ -1,6 +1,6 @@ # Test if compile errors are produced where necessary. -cmake_minimum_required(VERSION 3.8...3.25) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(compile-error-test CXX) set(fmt_headers " @@ -160,362 +142,325 @@ diff -U3 -r warzone2100.old/3rdparty/fmt/test/compile-error-test/CMakeLists.txt file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test/CMakeLists.txt" " - cmake_minimum_required(VERSION 3.8...3.25) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(tests CXX) add_subdirectory(${FMT_DIR} fmt) ${cmake_targets} diff -U3 -r warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt ---- warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2025-08-13 14:49:48.825763077 -0500 +--- warzone2100.old/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/fmt/test/find-package-test/CMakeLists.txt 2025-11-11 13:15:40.978662191 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8...3.25) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(fmt-test) diff -U3 -r warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt ---- warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2025-08-13 14:49:48.826355603 -0500 +--- warzone2100.old/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/fmt/test/static-export-test/CMakeLists.txt 2025-11-11 13:15:40.978096369 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8...3.25) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(fmt-link CXX) -diff -U3 -r warzone2100.old/3rdparty/glm/CMakeLists.txt warzone2100/3rdparty/glm/CMakeLists.txt ---- warzone2100.old/3rdparty/glm/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/glm/CMakeLists.txt 2025-08-13 14:49:48.827382757 -0500 +diff -U3 -r warzone2100.old/3rdparty/GameNetworkingSockets/CMakeLists.txt warzone2100/3rdparty/GameNetworkingSockets/CMakeLists.txt +--- warzone2100.old/3rdparty/GameNetworkingSockets/CMakeLists.txt 2025-09-16 11:42:25.000000000 -0500 ++++ warzone2100/3rdparty/GameNetworkingSockets/CMakeLists.txt 2025-11-11 13:15:40.974793781 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.12...4.0) - cmake_policy(VERSION 3.6) +-cmake_minimum_required(VERSION 3.9) ++cmake_minimum_required(VERSION 3.10...4.0) + + # If vcpkg present as submodule, bring in the toolchain + if( EXISTS ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake ) +@@ -14,7 +14,7 @@ + + # CMP0069: INTERPROCEDURAL_OPTIMIZATION is enforced when enabled. + # This variable is needed for abseil, which has a different +-# cmake_minimum_required version set (3.5). ++cmake_minimum_required(VERSION 3.10...4.0) + set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) + + # Put all the output from all projects into the same folder +diff -U3 -r warzone2100.old/3rdparty/GameNetworkingSockets/examples/vcpkg_example_chat/CMakeLists.txt warzone2100/3rdparty/GameNetworkingSockets/examples/vcpkg_example_chat/CMakeLists.txt +--- warzone2100.old/3rdparty/GameNetworkingSockets/examples/vcpkg_example_chat/CMakeLists.txt 2025-09-16 11:42:25.000000000 -0500 ++++ warzone2100/3rdparty/GameNetworkingSockets/examples/vcpkg_example_chat/CMakeLists.txt 2025-11-11 13:15:40.976404204 -0600 +@@ -2,7 +2,7 @@ + # Example porject that uses GameNetworkingSockets, obtaining + # dependencies, etc entirely through vcpkg. + # +-cmake_minimum_required(VERSION 3.9) ++cmake_minimum_required(VERSION 3.10...4.0) + project( example_chat_vcpkg ) + + # Ask vcpkg to fetch gamenetworkingsockets and all +diff -U3 -r warzone2100.old/3rdparty/glm/CMakeLists.txt warzone2100/3rdparty/glm/CMakeLists.txt +--- warzone2100.old/3rdparty/glm/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/glm/CMakeLists.txt 2025-11-11 13:15:40.967344329 -0600 +@@ -1,5 +1,5 @@ + # 3.6 is the actual minimun. 3.14 as the upper policy limit avoids CMake deprecation warnings. +-cmake_minimum_required(VERSION 3.6...3.14 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10...4.0) + cmake_policy(VERSION 3.6...3.14) file(READ "glm/detail/setup.hpp" GLM_SETUP_FILE) diff -U3 -r warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt ---- warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt 2025-08-13 14:49:48.827186410 -0500 +--- warzone2100.old/3rdparty/glm/test/cmake/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/glm/test/cmake/CMakeLists.txt 2025-11-11 13:15:40.968124096 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) cmake_policy(VERSION 3.6) project(test_find_glm) diff -U3 -r warzone2100.old/3rdparty/json/CMakeLists.txt warzone2100/3rdparty/json/CMakeLists.txt ---- warzone2100.old/3rdparty/json/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/3rdparty/json/CMakeLists.txt 2025-08-13 14:49:48.823963491 -0500 +--- warzone2100.old/3rdparty/json/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/3rdparty/json/CMakeLists.txt 2025-11-11 13:15:40.979565140 -0600 @@ -1,6 +1,6 @@ # A simplified version of: https://github.com/nlohmann/json/blob/b21c34517900c46a943c804d9af3a20cd0c77062/CMakeLists.txt -cmake_minimum_required(VERSION 3.1...3.14) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(nlohmann_json LANGUAGES CXX) diff -U3 -r warzone2100.old/3rdparty/launchinfo/CMakeLists.txt warzone2100/3rdparty/launchinfo/CMakeLists.txt ---- warzone2100.old/3rdparty/launchinfo/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/launchinfo/CMakeLists.txt 2025-08-13 14:49:48.830539650 -0500 +--- warzone2100.old/3rdparty/launchinfo/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/launchinfo/CMakeLists.txt 2025-11-11 13:15:40.980134929 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required (VERSION 3.5...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) project (launchinfo C CXX) file(GLOB HEADERS "include/LaunchInfo.h") diff -U3 -r warzone2100.old/3rdparty/libplum/CMakeLists.txt warzone2100/3rdparty/libplum/CMakeLists.txt ---- warzone2100.old/3rdparty/libplum/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/libplum/CMakeLists.txt 2025-08-13 14:49:48.830345294 -0500 +--- warzone2100.old/3rdparty/libplum/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/libplum/CMakeLists.txt 2025-11-11 13:15:40.979826761 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.7) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.7...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project (libplum - VERSION 0.4.0 + VERSION 0.5.3 LANGUAGES C) diff -U3 -r warzone2100.old/3rdparty/optional-lite/CMakeLists.txt warzone2100/3rdparty/optional-lite/CMakeLists.txt ---- warzone2100.old/3rdparty/optional-lite/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/3rdparty/optional-lite/CMakeLists.txt 2025-08-13 14:49:48.825564157 -0500 +--- warzone2100.old/3rdparty/optional-lite/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/3rdparty/optional-lite/CMakeLists.txt 2025-11-11 13:15:40.970277697 -0600 @@ -1,6 +1,6 @@ # A very simple version of: https://github.com/martinmoene/optional-lite/blob/master/CMakeLists.txt -cmake_minimum_required(VERSION 3.5...3.24) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project( optional_lite diff -U3 -r warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt warzone2100/3rdparty/quickjs-wz/CMakeLists.txt ---- warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/quickjs-wz/CMakeLists.txt 2025-08-13 14:49:48.824391310 -0500 +--- warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/quickjs-wz/CMakeLists.txt 2025-11-11 13:15:40.982219004 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5...3.14) -+cmake_minimum_required(VERSION 3.12...4.0) - project (quickjs C) +-cmake_minimum_required(VERSION 3.10...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) + project (quickjs-wz C) if(${CMAKE_VERSION} VERSION_LESS 3.12) +diff -U3 -r warzone2100.old/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt warzone2100/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt +--- warzone2100.old/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt 2025-11-11 13:15:40.982512036 -0600 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.10) ++cmake_minimum_required(VERSION 3.10...4.0) + + project(quickjs LANGUAGES C) + diff -U3 -r warzone2100.old/3rdparty/re2/CMakeLists.txt warzone2100/3rdparty/re2/CMakeLists.txt ---- warzone2100.old/3rdparty/re2/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/re2/CMakeLists.txt 2025-08-13 14:49:48.822044500 -0500 +--- warzone2100.old/3rdparty/re2/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/re2/CMakeLists.txt 2025-11-11 13:15:40.966731441 -0600 @@ -4,7 +4,7 @@ # Old enough to support Ubuntu Bionic, # but just the MAJOR.MINOR components. -cmake_minimum_required(VERSION 3.10) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(RE2 CXX) include(CMakePackageConfigHelpers) diff -U3 -r warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt ---- warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt 2025-08-13 14:49:48.828316645 -0500 -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.9) -+cmake_minimum_required(VERSION 3.12...4.0) - project(readerwriterqueue VERSION 1.0.0) +--- warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/readerwriterqueue/CMakeLists.txt 2025-11-11 13:15:40.981667922 -0600 +@@ -1,7 +1,7 @@ + # See https://discourse.cmake.org/t/how-to-fix-cmake-minimum-required-deprecation-warning/2487/2 + # for more on setting the minimum required version. + +-cmake_minimum_required(VERSION 3.9...3.31.7) ++cmake_minimum_required(VERSION 3.10...4.0) + project(readerwriterqueue VERSION 1.0.7) include(GNUInstallDirs) diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600 -+++ warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt 2025-08-13 14:49:48.829206089 -0500 +--- warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt 2025-09-16 11:42:54.000000000 -0500 ++++ warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt 2025-11-11 13:15:40.980594580 -0600 @@ -4,7 +4,7 @@ # # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt # or copy at http://opensource.org/licenses/MIT) -cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # custom CMake modules like FindSQLiteCpp - project(SQLiteCpp VERSION 3.3.1) + project(SQLiteCpp VERSION 3.3.2) diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2024-11-13 13:54:49.000000000 -0600 -+++ warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-08-13 14:49:48.829010729 -0500 +--- warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-09-16 11:42:54.000000000 -0500 ++++ warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-11-11 13:15:40.981337664 -0600 @@ -4,7 +4,7 @@ # # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt # or copy at http://opensource.org/licenses/MIT) -cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(SQLiteCpp_Example VERSION 2.0) # SQLiteC++ 3.x now requires C++11 compiler -diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/googletest/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600 -+++ warzone2100/3rdparty/SQLiteCpp/googletest/CMakeLists.txt 2025-08-13 14:49:48.829897152 -0500 -@@ -1,7 +1,7 @@ - # Note: CMake support is community-based. The maintainers do not use CMake - # internally. - --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required(VERSION 3.12...4.0) - - project(googletest-distribution) - set(GOOGLETEST_VERSION 1.14.0) -diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600 -+++ warzone2100/3rdparty/SQLiteCpp/googletest/googlemock/CMakeLists.txt 2025-08-13 14:49:48.829669555 -0500 -@@ -36,7 +36,7 @@ - # as ${gmock_SOURCE_DIR} and to the root binary directory as - # ${gmock_BINARY_DIR}. - # Language "C" is required for find_package(Threads). --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required(VERSION 3.12...4.0) - project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) - - if (COMMAND set_up_hermetic_build) -diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt 2024-11-13 13:54:50.000000000 -0600 -+++ warzone2100/3rdparty/SQLiteCpp/googletest/googletest/CMakeLists.txt 2025-08-13 14:49:48.830060677 -0500 -@@ -46,7 +46,7 @@ - - # Project version: - --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required(VERSION 3.12...4.0) - project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) - - if (COMMAND set_up_hermetic_build) diff -U3 -r warzone2100.old/3rdparty/utf8proc/CMakeLists.txt warzone2100/3rdparty/utf8proc/CMakeLists.txt ---- warzone2100.old/3rdparty/utf8proc/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/utf8proc/CMakeLists.txt 2025-08-13 14:49:48.824650163 -0500 +--- warzone2100.old/3rdparty/utf8proc/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/utf8proc/CMakeLists.txt 2025-11-11 13:15:40.970489260 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required (VERSION 3.10) ++cmake_minimum_required(VERSION 3.10...4.0) include (utils.cmake) +diff -U3 -r warzone2100.old/3rdparty/utf8proc/test/app/CMakeLists.txt warzone2100/3rdparty/utf8proc/test/app/CMakeLists.txt +--- warzone2100.old/3rdparty/utf8proc/test/app/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/utf8proc/test/app/CMakeLists.txt 2025-11-11 13:15:40.970768384 -0600 +@@ -1,5 +1,5 @@ + # This is a test app to test consuming utf8proc with CMake. +-cmake_minimum_required(VERSION 3.16) ++cmake_minimum_required(VERSION 3.10...4.0) + project(utf8proc-test) + find_package(utf8proc REQUIRED) + add_executable(app app.c) diff -U3 -r warzone2100.old/3rdparty/utfcpp/CMakeLists.txt warzone2100/3rdparty/utfcpp/CMakeLists.txt ---- warzone2100.old/3rdparty/utfcpp/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/utfcpp/CMakeLists.txt 2025-08-13 14:49:48.828870000 -0500 +--- warzone2100.old/3rdparty/utfcpp/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/utfcpp/CMakeLists.txt 2025-11-11 13:15:40.966075039 -0600 @@ -1,7 +1,7 @@ # This file is deprecated and will be removed in a future release # Please see the instructions for installation in README.md file -cmake_minimum_required (VERSION 3.14...3.27) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project (utf8cpp VERSION 4.0.4 LANGUAGES CXX diff -U3 -r warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt ---- warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-08-13 14:49:48.828480707 -0500 +--- warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-09-16 11:43:07.000000000 -0500 ++++ warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-11-11 13:15:40.966488334 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.0.2) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project (ftest VERSION 0.0.1 LANGUAGES CXX) enable_testing() diff -U3 -r warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt ---- warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt 2025-08-13 14:49:48.828685840 -0500 +--- warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 ++++ warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt 2025-11-11 13:15:40.966264301 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project(utfcpptests LANGUAGES CXX) enable_testing() diff -U3 -r warzone2100.old/build_tools/CMakeLists.txt warzone2100/build_tools/CMakeLists.txt ---- warzone2100.old/build_tools/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/build_tools/CMakeLists.txt 2025-08-13 14:49:48.832806206 -0500 +--- warzone2100.old/build_tools/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/build_tools/CMakeLists.txt 2025-11-11 13:15:40.965846621 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5...3.24) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.16...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) ############################ # Versioning (autorevision) diff -U3 -r warzone2100.old/CMakeLists.txt warzone2100/CMakeLists.txt ---- warzone2100.old/CMakeLists.txt 2025-08-13 14:48:22.252967002 -0500 -+++ warzone2100/CMakeLists.txt 2025-08-13 14:49:48.832964528 -0500 +--- warzone2100.old/CMakeLists.txt 2025-11-11 13:15:14.473586912 -0600 ++++ warzone2100/CMakeLists.txt 2025-11-11 13:15:40.982956680 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5...3.24) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.16...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff -U3 -r warzone2100.old/data/fonts/CMakeLists.txt warzone2100/data/fonts/CMakeLists.txt ---- warzone2100.old/data/fonts/CMakeLists.txt 2024-11-13 13:54:56.000000000 -0600 -+++ warzone2100/data/fonts/CMakeLists.txt 2025-08-13 14:49:48.831038582 -0500 +--- warzone2100.old/data/fonts/CMakeLists.txt 2025-09-16 11:43:07.000000000 -0500 ++++ warzone2100/data/fonts/CMakeLists.txt 2025-11-11 13:15:40.959816797 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.5) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.5...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/DejaVu/LICENSE" diff -U3 -r warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt ---- warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600 -+++ warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2025-08-13 14:49:48.831256841 -0500 +--- warzone2100.old/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2025-09-16 11:43:08.000000000 -0500 ++++ warzone2100/lib/netplay/3rdparty/miniupnp/miniupnpc/CMakeLists.txt 2025-11-11 13:15:40.965482788 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project (miniupnpc - VERSION 2.2.8 + VERSION 2.3.3 diff -U3 -r warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt ---- warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600 -+++ warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt 2025-08-13 14:49:48.831857223 -0500 +--- warzone2100.old/lib/sound/3rdparty/opusfile/CMakeLists.txt 2025-09-16 11:43:08.000000000 -0500 ++++ warzone2100/lib/sound/3rdparty/opusfile/CMakeLists.txt 2025-11-11 13:15:40.964008420 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") diff -U3 -r warzone2100.old/lib/wzmaplib/CMakeLists.txt warzone2100/lib/wzmaplib/CMakeLists.txt ---- warzone2100.old/lib/wzmaplib/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/lib/wzmaplib/CMakeLists.txt 2025-08-13 14:49:48.831615733 -0500 -@@ -22,7 +22,7 @@ +--- warzone2100.old/lib/wzmaplib/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/lib/wzmaplib/CMakeLists.txt 2025-11-11 13:15:40.962781424 -0600 +@@ -9,7 +9,7 @@ ############################## # wzmaplib project --cmake_minimum_required(VERSION ${_cmake_min_ver_supported}...3.24) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.16...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) project (wzmaplib CXX) - if(${CMAKE_VERSION} VERSION_LESS 3.12) + OPTION(WZMAPLIB_ENABLE_ZIPIOPROVIDER "wzmaplib: Provide ZipIOProvider (which requires libzip)" ON) diff -U3 -r warzone2100.old/po/CMakeLists.txt warzone2100/po/CMakeLists.txt ---- warzone2100.old/po/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/po/CMakeLists.txt 2025-08-13 14:49:48.830713731 -0500 -@@ -15,7 +15,7 @@ - # CMake 3.10+ at the top of this file leads to an inability to compile via - # Visual Studio itself. - # -- # Instead of using cmake_minimum_required(VERSION 3.10), detect the -+cmake_minimum_required(VERSION 3.12...4.0) - # CMake version and emit a warning if it's below 3.10. - # - if(${CMAKE_VERSION} VERSION_LESS "3.10.0") -diff -U3 -r warzone2100.old/src/integrations/CMakeLists.txt warzone2100/src/integrations/CMakeLists.txt ---- warzone2100.old/src/integrations/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/src/integrations/CMakeLists.txt 2025-08-13 14:49:48.832121148 -0500 +--- warzone2100.old/po/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/po/CMakeLists.txt 2025-11-11 13:15:40.956128485 -0600 @@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5...3.24) -+cmake_minimum_required(VERSION 3.12...4.0) +-cmake_minimum_required(VERSION 3.16...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) + + if(NOT ENABLE_NLS) + message(STATUS "Skipping translations generation / native language support") +diff -U3 -r warzone2100.old/src/integrations/CMakeLists.txt warzone2100/src/integrations/CMakeLists.txt +--- warzone2100.old/src/integrations/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/src/integrations/CMakeLists.txt 2025-11-11 13:15:40.959547975 -0600 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.16...3.31) ++cmake_minimum_required(VERSION 3.10...4.0) ################################################## # WZ Discord RPC support diff -U3 -r warzone2100.old/tools/map/old/CMakeLists.txt warzone2100/tools/map/old/CMakeLists.txt ---- warzone2100.old/tools/map/old/CMakeLists.txt 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/tools/map/old/CMakeLists.txt 2025-08-13 14:49:48.832305121 -0500 +--- warzone2100.old/tools/map/old/CMakeLists.txt 2025-09-16 11:41:32.000000000 -0500 ++++ warzone2100/tools/map/old/CMakeLists.txt 2025-11-11 13:15:40.958291818 -0600 @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) project (maptools) diff -U3 -r warzone2100.old/tools/maptools-cli/CMakeLists.txt warzone2100/tools/maptools-cli/CMakeLists.txt ---- warzone2100.old/tools/maptools-cli/CMakeLists.txt 2024-11-13 13:54:57.000000000 -0600 -+++ warzone2100/tools/maptools-cli/CMakeLists.txt 2025-08-13 14:49:48.832560376 -0500 +--- warzone2100.old/tools/maptools-cli/CMakeLists.txt 2025-09-16 11:43:08.000000000 -0500 ++++ warzone2100/tools/maptools-cli/CMakeLists.txt 2025-11-11 13:15:40.957878508 -0600 @@ -7,7 +7,7 @@ set(_cmake_min_ver_supported 3.11) # CMake 3.11 is the minimum version for FetchContent endif() -cmake_minimum_required(VERSION ${_cmake_min_ver_supported}...3.14) -+cmake_minimum_required(VERSION 3.12...4.0) ++cmake_minimum_required(VERSION 3.10...4.0) set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) ---- warzone2100/doc/CMakeLists.txt~ 2024-11-13 13:54:24.000000000 -0600 -+++ warzone2100/doc/CMakeLists.txt 2025-08-13 15:12:41.371983496 -0500 -@@ -16,6 +16,7 @@ - COMMAND ${CMAKE_COMMAND} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/GenerateJSDocs.cmake - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - VERBATIM -+ POST_BUILD - ) - - configure_file(Scripting.md "${CMAKE_CURRENT_BINARY_DIR}/Scripting.md" COPYONLY) ---- warzone2100/doc/CMakeLists.txt~ 2025-08-13 15:23:14.837051821 -0500 -+++ warzone2100/doc/CMakeLists.txt 2025-08-13 15:25:02.458759347 -0500 -@@ -131,6 +131,7 @@ - -a toc - ${CMAKE_CURRENT_BINARY_DIR}/quickstartguide.asciidoc - VERBATIM -+ POST_BUILD - ) - - configure_file("warzone2100.6.asciidoc" "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc" COPYONLY) -@@ -146,6 +147,7 @@ - -D ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc - VERBATIM -+ POST_BUILD - ) - - # warzone2100.6 - man-page format -@@ -160,6 +162,7 @@ - -o warzone2100.6 - ${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6.asciidoc - VERBATIM -+ POST_BUILD - ) - - unset(_asciidoctor_option_failurelevel) -@@ -270,12 +273,14 @@ - COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}" - COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} - VERBATIM -+ POST_BUILD - ) - else() - add_custom_command( - TARGET wz2100_manpages - COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} - VERBATIM -+ POST_BUILD - ) - endif() - diff --git a/sources b/sources index 30c27a7..d50cf36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (warzone2100_src.tar.xz) = 74a085e760e16605fde93bce0f82b09df6789913f4b6d138499cea6250955f63589b65035ae6463f450dcf779fdad0d2324b0e0a554c2f3f93a0d625061426b4 SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 -SHA512 (warzone2100_src.tar.xz) = b153306ea8a55334a37580c2862579f6b6a283ba3c082901fcb97fe4da3a6ae4b7bc9bd7c1fa33f39a3b5113876080b90422174f376a7ed148a18f21f57ee8b3 diff --git a/warzone2100.spec b/warzone2100.spec index 4a01601..ba43e90 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,8 +2,8 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.5.5 -Release: 3%{?dist} +Version: 4.6.1 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. @@ -12,11 +12,12 @@ URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz -Patch0: SQLiteCPP-gcc15.patch Patch1: cmake4.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} +# https://github.com/Warzone2100/warzone2100/issues/4577 +ExcludeArch: s390x BuildRequires: cmake BuildRequires: desktop-file-utils @@ -32,11 +33,13 @@ BuildRequires: libpng-devel BuildRequires: libsodium-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel +BuildRequires: libzip-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel BuildRequires: opus-devel BuildRequires: p7zip BuildRequires: physfs-devel +BuildRequires: protobuf-devel BuildRequires: rubygem-asciidoctor BuildRequires: SDL2-devel BuildRequires: sqlite-devel @@ -96,6 +99,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Tue Sep 16 2025 Gwyn Ciesla - 4.6.1-1 +- 4.6.1 + * Fri Jul 25 2025 Fedora Release Engineering - 4.5.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ba1815664c1446f2c3c970611fe7358eae204d36 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 10 Dec 2025 08:50:44 -0600 Subject: [PATCH 76/82] 4.6.2 --- cmake4.patch | 62 +++++++----------------------------------------- sources | 2 +- warzone2100.spec | 9 +++++-- 3 files changed, 16 insertions(+), 57 deletions(-) diff --git a/cmake4.patch b/cmake4.patch index 95bc503..b257175 100644 --- a/cmake4.patch +++ b/cmake4.patch @@ -262,15 +262,6 @@ diff -U3 -r warzone2100.old/3rdparty/quickjs-wz/CMakeLists.txt warzone2100/3rdpa project (quickjs-wz C) if(${CMAKE_VERSION} VERSION_LESS 3.12) -diff -U3 -r warzone2100.old/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt warzone2100/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt ---- warzone2100.old/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 -+++ warzone2100/3rdparty/quickjs-wz/quickjs-ng/CMakeLists.txt 2025-11-11 13:15:40.982512036 -0600 -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.10) -+cmake_minimum_required(VERSION 3.10...4.0) - - project(quickjs LANGUAGES C) - diff -U3 -r warzone2100.old/3rdparty/re2/CMakeLists.txt warzone2100/3rdparty/re2/CMakeLists.txt --- warzone2100.old/3rdparty/re2/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 +++ warzone2100/3rdparty/re2/CMakeLists.txt 2025-11-11 13:15:40.966731441 -0600 @@ -295,30 +286,6 @@ diff -U3 -r warzone2100.old/3rdparty/readerwriterqueue/CMakeLists.txt warzone210 project(readerwriterqueue VERSION 1.0.7) include(GNUInstallDirs) -diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/CMakeLists.txt 2025-09-16 11:42:54.000000000 -0500 -+++ warzone2100/3rdparty/SQLiteCpp/CMakeLists.txt 2025-11-11 13:15:40.980594580 -0600 -@@ -4,7 +4,7 @@ - # - # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt - # or copy at http://opensource.org/licenses/MIT) --cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.10...4.0) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # custom CMake modules like FindSQLiteCpp - project(SQLiteCpp VERSION 3.3.2) - -diff -U3 -r warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt ---- warzone2100.old/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-09-16 11:42:54.000000000 -0500 -+++ warzone2100/3rdparty/SQLiteCpp/examples/example2/CMakeLists.txt 2025-11-11 13:15:40.981337664 -0600 -@@ -4,7 +4,7 @@ - # - # Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt - # or copy at http://opensource.org/licenses/MIT) --cmake_minimum_required(VERSION 3.1) # for "CMAKE_CXX_STANDARD" version -+cmake_minimum_required(VERSION 3.10...4.0) - project(SQLiteCpp_Example VERSION 2.0) - - # SQLiteC++ 3.x now requires C++11 compiler diff -U3 -r warzone2100.old/3rdparty/utf8proc/CMakeLists.txt warzone2100/3rdparty/utf8proc/CMakeLists.txt --- warzone2100.old/3rdparty/utf8proc/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 +++ warzone2100/3rdparty/utf8proc/CMakeLists.txt 2025-11-11 13:15:40.970489260 -0600 @@ -338,27 +305,6 @@ diff -U3 -r warzone2100.old/3rdparty/utf8proc/test/app/CMakeLists.txt warzone210 project(utf8proc-test) find_package(utf8proc REQUIRED) add_executable(app app.c) -diff -U3 -r warzone2100.old/3rdparty/utfcpp/CMakeLists.txt warzone2100/3rdparty/utfcpp/CMakeLists.txt ---- warzone2100.old/3rdparty/utfcpp/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 -+++ warzone2100/3rdparty/utfcpp/CMakeLists.txt 2025-11-11 13:15:40.966075039 -0600 -@@ -1,7 +1,7 @@ - # This file is deprecated and will be removed in a future release - # Please see the instructions for installation in README.md file - --cmake_minimum_required (VERSION 3.14...3.27) -+cmake_minimum_required(VERSION 3.10...4.0) - project (utf8cpp - VERSION 4.0.4 - LANGUAGES CXX -diff -U3 -r warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt ---- warzone2100.old/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-09-16 11:43:07.000000000 -0500 -+++ warzone2100/3rdparty/utfcpp/extern/ftest/tests/CMakeLists.txt 2025-11-11 13:15:40.966488334 -0600 -@@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.0.2) -+cmake_minimum_required(VERSION 3.10...4.0) - project (ftest VERSION 0.0.1 LANGUAGES CXX) - - enable_testing() diff -U3 -r warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt --- warzone2100.old/3rdparty/utfcpp/tests/CMakeLists.txt 2025-09-16 11:43:06.000000000 -0500 +++ warzone2100/3rdparty/utfcpp/tests/CMakeLists.txt 2025-11-11 13:15:40.966264301 -0600 @@ -464,3 +410,11 @@ diff -U3 -r warzone2100.old/tools/maptools-cli/CMakeLists.txt warzone2100/tools/ set(_OLD_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +--- a/3rdparty/utfcpp/CMakeLists.txt~ 2025-12-09 07:31:34.000000000 -0600 ++++ b/3rdparty/utfcpp/CMakeLists.txt 2025-12-09 13:53:08.443636881 -0600 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.14...3.27) ++cmake_minimum_required (VERSION 3.10...4.0) + project (utf8cpp + VERSION 4.0.8 + LANGUAGES CXX diff --git a/sources b/sources index d50cf36..0500b98 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (warzone2100_src.tar.xz) = 74a085e760e16605fde93bce0f82b09df6789913f4b6d138499cea6250955f63589b65035ae6463f450dcf779fdad0d2324b0e0a554c2f3f93a0d625061426b4 +SHA512 (warzone2100_src.tar.xz) = 24cffab0ba0e381c9d3ecb51a83532985c89a36290bd9d5a0f8a4cc369213e7fafce830a576af7204425c9ba1aa46162f1b3f0507da8d2472718a1cb41ec2982 SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 diff --git a/warzone2100.spec b/warzone2100.spec index ba43e90..9de3a70 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,7 +2,7 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.6.1 +Version: 4.6.2 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -22,6 +22,7 @@ ExcludeArch: s390x BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: freetype-devel +BuildREquires: fribidi-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext @@ -34,6 +35,7 @@ BuildRequires: libsodium-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: libzip-devel +BuildRequires: miniupnpc-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel BuildRequires: opus-devel @@ -41,7 +43,7 @@ BuildRequires: p7zip BuildRequires: physfs-devel BuildRequires: protobuf-devel BuildRequires: rubygem-asciidoctor -BuildRequires: SDL2-devel +BuildRequires: SDL3-devel BuildRequires: sqlite-devel BuildRequires: vulkan-devel @@ -99,6 +101,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Tue Dec 09 2025 Gwyn Ciesla - 4.6.2-1 +- 4.6.2 + * Tue Sep 16 2025 Gwyn Ciesla - 4.6.1-1 - 4.6.1 From a138d543df7021444914756911506e55a8d4ccfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:07:14 +0000 Subject: [PATCH 77/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index 9de3a70..9fb049c 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. @@ -101,6 +101,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Dec 09 2025 Gwyn Ciesla - 4.6.2-1 - 4.6.2 From e894ce1c158a4bbe794174191aad22bb33295655 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 5 Feb 2026 08:56:59 -0600 Subject: [PATCH 78/82] 4.6.3 --- sources | 2 +- warzone2100.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 0500b98..4225166 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (warzone2100_src.tar.xz) = 24cffab0ba0e381c9d3ecb51a83532985c89a36290bd9d5a0f8a4cc369213e7fafce830a576af7204425c9ba1aa46162f1b3f0507da8d2472718a1cb41ec2982 +SHA512 (warzone2100_src.tar.xz) = 14b7e502dd2f5b5350d80e5210718aa9118859381e3f33e80ae0b83a05136103b480d1e510e56b0cfac20a56bc51801db98c25c15636d21f1c847a70a56bf8ed SHA512 (high-quality-en-sequences.wz) = 2a4a9e299412fe1adac21001848d10575be69039bb2d762bcad94faefbf498ff72ff0e37fc4017c7598692d250456a444d6d5619c88a9772cfd3a03d4b780f12 diff --git a/warzone2100.spec b/warzone2100.spec index 9fb049c..d57b2bf 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -2,8 +2,8 @@ %global _cmake_shared_libs %{nil} Name: warzone2100 -Version: 4.6.2 -Release: 2%{?dist} +Version: 4.6.3 +Release: 1%{?dist} Summary: Innovative 3D real-time strategy # Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. @@ -101,6 +101,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Wed Feb 04 2026 Gwyn Ciesla - 4.6.3-1 +- 4.6.3 + * Sat Jan 17 2026 Fedora Release Engineering - 4.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 27ed080c454109da56f7763f2cfcb92b6c2207c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 13 Apr 2026 08:33:45 +0200 Subject: [PATCH 79/82] migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- warzone2100.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/warzone2100.spec b/warzone2100.spec index d57b2bf..e96bbc2 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -6,8 +6,8 @@ Version: 4.6.3 Release: 1%{?dist} Summary: Innovative 3D real-time strategy -# Automatically converted from old format: GPLv2+ and CC-BY-SA - review is highly recommended. -License: GPL-2.0-or-later AND LicenseRef-Callaway-CC-BY-SA +# See COPYING.NONGPL +License: GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC0-1.0 AND MIT AND Apache-2.0 AND OFL-1.1 AND BSD-3-Clause AND CC-BY-4.0 AND MPL-2.0 AND ISC URL: http://wz2100.net/ Source0: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source1: https://github.com/Warzone2100/wz-sequences/releases/download/v3/high-quality-en-sequences.wz From eb41bb4e9706712ee05c61d46f0c6fa75cb21ae5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:04:32 -0400 Subject: [PATCH 80/82] Rebuilt for openssl 4.0 --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index e96bbc2..f1c8112 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Innovative 3D real-time strategy # See COPYING.NONGPL @@ -101,6 +101,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 4.6.3-2 +- Rebuilt for openssl 4.0 + * Wed Feb 04 2026 Gwyn Ciesla - 4.6.3-1 - 4.6.3 From b050c628cef59ec7cb8c339f78ed052768d7664e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:41:27 +0000 Subject: [PATCH 81/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- warzone2100.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/warzone2100.spec b/warzone2100.spec index f1c8112..d08667e 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -3,7 +3,7 @@ Name: warzone2100 Version: 4.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Innovative 3D real-time strategy # See COPYING.NONGPL @@ -101,6 +101,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/icons/net.wz2100.warzone2100.png \ %{_datadir}/warzone2100/sequences.wz %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 4.6.3-2 - Rebuilt for openssl 4.0 From 3898de6f87c138540f0514322e03236408416fbb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 10 Aug 2026 08:08:57 -0500 Subject: [PATCH 82/82] 4.7.0 --- ...c62ae68ca70da43ec915cbf6776c492e6656.patch | 44 +++++++++++++++++++ sources | 2 +- warzone2100.spec | 12 ++++- 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 8701c62ae68ca70da43ec915cbf6776c492e6656.patch diff --git a/8701c62ae68ca70da43ec915cbf6776c492e6656.patch b/8701c62ae68ca70da43ec915cbf6776c492e6656.patch new file mode 100644 index 0000000..a4b432c --- /dev/null +++ b/8701c62ae68ca70da43ec915cbf6776c492e6656.patch @@ -0,0 +1,44 @@ +From 8701c62ae68ca70da43ec915cbf6776c492e6656 Mon Sep 17 00:00:00 2001 +From: Dmitry Marakasov +Date: Tue, 12 May 2026 22:55:00 +0300 +Subject: [PATCH] Replace deprecated vulkan enum value +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Replace `eVkColorspaceSrgbNonlinear` with `eSrgbNonlinear`, as the +former was removed in vulkan 1.4.350, and was a legacy alias to the latter +(more precisely, `eSrgbNonlinear` → `VK_COLORSPACE_SRGB_NONLINEAR_KHR` → +[legacy alias to] `VK_COLOR_SPACE_SRGB_NONLINEAR_KHR` ← `eSrgbNonlinear`). +--- + lib/ivis_opengl/gfx_api_vk.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp +index f137f496509..dcedf473de7 100644 +--- a/lib/ivis_opengl/gfx_api_vk.cpp ++++ b/lib/ivis_opengl/gfx_api_vk.cpp +@@ -4255,10 +4255,10 @@ void VkRoot::createNewSwapchainAndSwapchainSpecificStuff(const vk::Result& reaso + vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector& availableFormats) + { + const auto desiredFormats = std::array { +- vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }, +- vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }, +- vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }, +- vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear } ++ vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear }, ++ vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear }, ++ vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear }, ++ vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear } + }; + + if(availableFormats.size() == 1 +@@ -4266,7 +4266,7 @@ vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector - 4.7.0-1 +- 4.7.0 + * Fri Jul 17 2026 Fedora Release Engineering - 4.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild