commit 09e3f5991cba63619d7ca93d3aa0787bd764857e Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Aug 3 16:20:05 2023 +0100 Rebase to version 2022.10.28 EmptyEpsilon.spec | 47 ++--- gcc12.patch | 26 +++ sources | 4 +- upstream_EE_001_69d93e6acd.patch | 45 ----- upstream_EE_002_872ef2667c.patch | 25 --- upstream_EE_003_ee0cd42bfe.patch | 27 --- upstream_EE_004_530fe32f95.patch | 387 --------------------------------------- upstream_SP_001_32509f2db9.patch | 59 ------ upstream_SP_002_d52a1b1b61.patch | 25 --- upstream_SP_003_ec30d87c22.patch | 88 --------- upstream_SP_004_adbba45fd9.patch | 131 ------------- upstream_SP_005_0d1ac45b73.patch | 44 ----- 12 files changed, 43 insertions(+), 865 deletions(-) --- diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec index b61c417..099cc18 100644 --- a/EmptyEpsilon.spec +++ b/EmptyEpsilon.spec @@ -1,21 +1,20 @@ -%global version_major 2021 -%global version_minor 06 -%global version_patch 23 +%global version_major 2022 +%global version_minor 10 +%global version_patch 28 Name: EmptyEpsilon Summary: Spaceship bridge simulator game Version: %{version_major}.%{version_minor}.%{version_patch} -Release: 5%{?dist} -License: GPLv2 +Release: 1%{?dist} +License: GPL-2.0-only -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: SFML-devel >= 2.5.1 BuildRequires: mesa-libGLU-devel >= 9.0.0 BuildRequires: desktop-file-utils # The following version of "glm-devel" is not currently available for Fedora 33 and older BuildRequires: glm-devel >= 0.9.9.8 -BuildRequires: json11-devel ExcludeArch: ppc64 ppc64le @@ -26,23 +25,13 @@ Source1: https://github.com/daid/SeriousProton/archive/EE-%{version}.zip# # EmptyEpsilon downstream patches: -#Patch1: +Patch0: gcc12.patch # SeriousProton downstream patches: -#Patch20: # EmptyEpsilon upstream patches: -Patch40: upstream_EE_001_69d93e6acd.patch -Patch41: upstream_EE_002_872ef2667c.patch -Patch42: upstream_EE_003_ee0cd42bfe.patch -Patch43: upstream_EE_004_530fe32f95.patch # SeriousProton upstream patches: -Patch60: upstream_SP_001_32509f2db9.patch -Patch61: upstream_SP_002_d52a1b1b61.patch -Patch62: upstream_SP_003_ec30d87c22.patch -Patch63: upstream_SP_004_adbba45fd9.patch -Patch64: upstream_SP_005_0d1ac45b73.patch Recommends: xclip @@ -61,34 +50,24 @@ Note: Network play require port 35666 UDP and TCP allowed in firewall. %prep %setup -q -a 1 -n EmptyEpsilon-EE-%{version} - -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch60 -p1 -d SeriousProton-EE-%{version} -%patch61 -p1 -d SeriousProton-EE-%{version} -%patch62 -p1 -d SeriousProton-EE-%{version} -%patch63 -p1 -d SeriousProton-EE-%{version} -%patch64 -p1 -d SeriousProton-EE-%{version} +%patch -P0 -p1 %build -%cmake3 \ +%cmake \ -DSERIOUS_PROTON_DIR=SeriousProton-EE-%{version}/ \ -DCPACK_PACKAGE_VERSION_MAJOR=%{version_major} \ -DCPACK_PACKAGE_VERSION_MINOR=%{version_minor} \ -DCPACK_PACKAGE_VERSION_PATCH=%{version_patch} \ - -DWITH_JSON="system" \ -DWITH_GLM="system" \ -DCONFIG_DIR=%{_sysconfdir}/emptyepsilon/ -%cmake3_build +%cmake_build %install -%cmake3_install +%cmake_install # icon to pixmaps mkdir -p %{buildroot}%{_datadir}/pixmaps @@ -114,10 +93,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %license LICENSE %{_bindir}/EmptyEpsilon %{_datadir}/emptyepsilon +%{_datadir}/icons/hicolor/1024x1024/ %{_datadir}/pixmaps/EmptyEpsilon.png %{_datadir}/applications/%{name}.desktop %changelog +* Thu Aug 03 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2022.10.28-1 +- Rebase to version 2022.10.28 + * Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 2021.06.23-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/gcc12.patch b/gcc12.patch new file mode 100644 index 0000000..9d27594 --- /dev/null +++ b/gcc12.patch @@ -0,0 +1,26 @@ +--- a/SeriousProton-EE-2022.10.28/src/io/http/websocket.h ++++ b/SeriousProton-EE-2022.10.28/src/io/http/websocket.h +@@ -4,10 +4,7 @@ + #include <nonCopyable.h> + #include <io/network/tcpSocket.h> + #include <unordered_map> +- +-#ifndef EMSCRIPTEN + #include <memory> +-#endif + + namespace sp { + namespace io { + +--- a/SeriousProton-EE-2022.10.28/src/io/network/address.h ++++ b/SeriousProton-EE-2022.10.28/src/io/network/address.h +@@ -3,7 +3,7 @@ + + #include <stringImproved.h> + #include <list> +- ++#include <cstdint> + + namespace sp { + namespace io { + diff --git a/sources b/sources index c543d6a..621ea1e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (EmptyEpsilon-EE-2021.06.23.zip) = 40efed8eb7433323e1d554f66e5ec1a75c4dab23e42664a46e4758dfcb518f51f1d28e1ff76117b319f963bfc2d810d06bbd25d4c0d1f652adf4990332cd43ce -SHA512 (SeriousProton-EE-2021.06.23.zip) = 63a7fa7022f58fb1b87de509bd4ab122cd17ce3360d1ff48d50c0a7ad1fa55f1a18c512c3e0910a56ff814540983d62edf44b1a45b4a0054e0a01ce81aa4bea2 +SHA512 (EmptyEpsilon-EE-2022.10.28.zip) = e2fd190dc6f35bec679463e6dd1ca64ff203bb96db1c3f39248d8e89e2d5d9802db0e8f41960ee9d732959c769f698847ea929293859eb0f4f728bedd1ff7b15 +SHA512 (SeriousProton-EE-2022.10.28.zip) = 3eb2ac21e89d41efe7bb2ca13860db6c68729254e8612ab8a7ed22020f58aef2b809737d60a596a5ab2136e38f3c28d907041a806e9a4a2a6948df6260a0c803