[devedeng] Drop patch
by Leigh Scott
commit f0c51d90f7ebea4411362a6e3882f1718b03cc10
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Aug 5 10:21:15 2023 +0100
Drop patch
devedeng.spec | 6 ++++--
temporary_python312_fix.patch | 25 -------------------------
2 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/devedeng.spec b/devedeng.spec
index 8aee560..0bc4e79 100644
--- a/devedeng.spec
+++ b/devedeng.spec
@@ -1,12 +1,11 @@
Name: devedeng
Version: 4.17.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
License: GPLv3
URL: http://www.rastersoft.com/programas/devede.html
Source0: https://gitlab.com/rastersoft/devedeng/-/archive/%{version}/%{name}-%{ver...
-Patch0: temporary_python312_fix.patch
BuildArch: noarch
@@ -100,6 +99,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%changelog
+* Sat Aug 05 2023 Leigh Scott <leigh123linux(a)gmail.com> - 4.17.0-6
+- Drop patch
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.17.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 3 months
[cannonball] Added a patch to improve handling of 'back' state. Fix FTBFS.
by Andrea Musuruane
commit 2a9a2cab1977531f886434cda4ee9ff1ebd9b6f5
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 5 09:53:25 2023 +0200
Added a patch to improve handling of 'back' state. Fix FTBFS.
cannonball-0.34-better_back_state.patch | 312 ++++++++++++++++++++++++++++++++
cannonball.spec | 8 +-
2 files changed, 319 insertions(+), 1 deletion(-)
---
diff --git a/cannonball-0.34-better_back_state.patch b/cannonball-0.34-better_back_state.patch
new file mode 100644
index 0000000..1cbb56e
--- /dev/null
+++ b/cannonball-0.34-better_back_state.patch
@@ -0,0 +1,312 @@
+From 135a0f3a56eedf13c5fea1d93711141a3c921572 Mon Sep 17 00:00:00 2001
+From: DJ YT <blah(a)blah.com>
+Date: Mon, 3 May 2021 19:41:58 +0100
+Subject: [PATCH] Better handling of 'back' state
+
+---
+ src/main/frontend/menu.cpp | 89 ++++++++++++++++++++------------------
+ src/main/frontend/menu.hpp | 12 ++++-
+ 2 files changed, 58 insertions(+), 43 deletions(-)
+
+diff --git a/src/main/frontend/menu.cpp b/src/main/frontend/menu.cpp
+index e5bde928..b3e8afe7 100644
+--- a/src/main/frontend/menu.cpp
++++ b/src/main/frontend/menu.cpp
+@@ -57,6 +57,13 @@ void Menu::populate()
+ else
+ populate_for_pc();
+
++ menu_handling.push_back(ENTRY_GRIP);
++ menu_handling.push_back(ENTRY_OFFROAD);
++ menu_handling.push_back(ENTRY_BUMPER);
++ menu_handling.push_back(ENTRY_TURBO);
++ menu_handling.push_back(ENTRY_COLOR);
++ menu_handling.push_back(ENTRY_BACK);
++
+ menu_cont.push_back(ENTRY_START_CONT);
+ menu_cont.push_back(ENTRY_TRAFFIC);
+ menu_cont.push_back(ENTRY_BACK);
+@@ -145,13 +152,6 @@ void Menu::populate_for_pc()
+ menu_enhancements.push_back(ENTRY_OBJECTS);
+ menu_enhancements.push_back(ENTRY_PROTOTYPE);
+ menu_enhancements.push_back(ENTRY_BACK);
+-
+- menu_handling.push_back(ENTRY_GRIP);
+- menu_handling.push_back(ENTRY_OFFROAD);
+- menu_handling.push_back(ENTRY_BUMPER);
+- menu_handling.push_back(ENTRY_TURBO);
+- menu_handling.push_back(ENTRY_COLOR);
+- menu_handling.push_back(ENTRY_BACK);
+ }
+
+ // Split into own function to handle controllers being added/removed
+@@ -217,11 +217,11 @@ void Menu::populate_for_cabinet()
+ menu_s_exsettings.push_back(ENTRY_SCORES);
+ menu_s_exsettings.push_back(ENTRY_SAVE);
+
++ menu_s_enhance.push_back(ENTRY_SUB_HANDLING);
+ menu_s_enhance.push_back(ENTRY_PREVIEWSND);
+ menu_s_enhance.push_back(ENTRY_FIXSAMPLES);
+ menu_s_enhance.push_back(ENTRY_ATTRACT);
+ menu_s_enhance.push_back(ENTRY_OBJECTS);
+- menu_s_enhance.push_back(ENTRY_PROTOTYPE);
+ menu_s_enhance.push_back(ENTRY_TIMER);
+ menu_s_enhance.push_back(ENTRY_S_BUGS);
+ menu_s_enhance.push_back(ENTRY_BACK);
+@@ -267,7 +267,7 @@ void Menu::init(bool init_main_menu)
+
+ if (init_main_menu)
+ {
+- cursor_stack.clear();
++ menu_stack.clear();
+ set_menu(&menu_main);
+ refresh_menu();
+ }
+@@ -297,7 +297,7 @@ void Menu::tick()
+ if (cabdiag->tick())
+ {
+ init(false);
+- set_menu(&menu_s_tests, true);
++ menu_back();
+ refresh_menu();
+ }
+ break;
+@@ -458,7 +458,7 @@ void Menu::tick_menu()
+ if (SELECTED(ENTRY_SAVE))
+ {
+ display_message(config.save() ? "SETTINGS SAVED" : "ERROR SAVING SETTINGS!");
+- set_menu(&menu_main, true);
++ menu_back();
+ }
+ else if (SELECTED(ENTRY_FIXSAMPLES))
+ {
+@@ -498,7 +498,7 @@ void Menu::tick_menu()
+ else if (SELECTED(ENTRY_ORIGINAL)) start_game(Outrun::MODE_ORIGINAL, 2);
+ else if (SELECTED(ENTRY_CONT)) set_menu(&menu_cont);
+ else if (SELECTED(ENTRY_TIMETRIAL)) set_menu(&menu_timetrial);
+- else if (SELECTED(ENTRY_BACK)) set_menu(&menu_main, true);
++ else if (SELECTED(ENTRY_BACK)) menu_back();
+ }
+ else if (menu_selected == &menu_cont)
+ {
+@@ -514,7 +514,7 @@ void Menu::tick_menu()
+ config.cont_traffic = 0;
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_gamemodes, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_timetrial)
+ {
+@@ -538,11 +538,11 @@ void Menu::tick_menu()
+ config.ttrial.traffic = 0;
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_gamemodes, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_about)
+ {
+- set_menu(&menu_main, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_settings)
+ {
+@@ -585,25 +585,25 @@ void Menu::tick_menu()
+ {
+ if (SELECTED(ENTRY_S_MOTOR))
+ {
+- cursor_stack.push_back(cursor);
++ set_menu(&menu_s_tests); // dummy (just store cursor for menu_back)
+ cabdiag->set(CabDiag::STATE_MOTORT);
+ state = STATE_DIAGNOSTICS; return;
+ }
+ else if (SELECTED(ENTRY_S_INPUTS))
+ {
+- cursor_stack.push_back(cursor);
++ set_menu(&menu_s_tests); // dummy (just store cursor for menu_back)
+ cabdiag->set(CabDiag::STATE_INPUT);
+ state = STATE_DIAGNOSTICS; return;
+ }
+ else if (SELECTED(ENTRY_S_OUTPUTS))
+ {
+- cursor_stack.push_back(cursor);
++ set_menu(&menu_s_tests); // dummy (just store cursor for menu_back)
+ cabdiag->set(CabDiag::STATE_OUTPUT);
+ state = STATE_DIAGNOSTICS; return;
+ }
+ else if (SELECTED(ENTRY_S_CRT))
+ {
+- cursor_stack.push_back(cursor);
++ set_menu(&menu_s_tests); // dummy (just store cursor for menu_back)
+ cabdiag->set(CabDiag::STATE_CRT);
+ state = STATE_DIAGNOSTICS; return;
+ }
+@@ -613,7 +613,7 @@ void Menu::tick_menu()
+ set_menu(&menu_musictest);
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_main, true);
++ menu_back();
+ }
+ // DIP Menu (SmartyPi Only)
+ else if (menu_selected == &menu_s_dips)
+@@ -633,13 +633,14 @@ void Menu::tick_menu()
+ // Enahnce Menu (SmartyPi Only)
+ else if (menu_selected == &menu_s_enhance)
+ {
+- if (SELECTED(ENTRY_PREVIEWSND)) config.sound.preview ^= 1;
++ if (SELECTED(ENTRY_SUB_HANDLING)) set_menu(&menu_handling);
++ else if (SELECTED(ENTRY_PREVIEWSND)) config.sound.preview ^= 1;
+ else if (SELECTED(ENTRY_ATTRACT)) config.engine.new_attract ^= 1;
+ else if (SELECTED(ENTRY_OBJECTS)) config.engine.level_objects ^= 1;
+ else if (SELECTED(ENTRY_PROTOTYPE)) config.engine.prototype ^= 1;
+ else if (SELECTED(ENTRY_S_BUGS)) config.engine.fix_bugs ^= 1;
+ else if (SELECTED(ENTRY_TIMER)) config.engine.fix_timer ^= 1;
+- else if (SELECTED(ENTRY_BACK)) set_menu(&menu_s_exsettings, true);
++ else if (SELECTED(ENTRY_BACK)) menu_back();
+ }
+ else if (menu_selected == &menu_video)
+ {
+@@ -690,7 +691,7 @@ void Menu::tick_menu()
+ config.set_fps(config.video.fps);
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_settings, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_sound)
+ {
+@@ -712,7 +713,7 @@ void Menu::tick_menu()
+ set_menu(&menu_musictest);
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_settings, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_controls)
+ {
+@@ -741,7 +742,7 @@ void Menu::tick_menu()
+ config.controls.pedal_speed = 1;
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_settings, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_controls_gp)
+ {
+@@ -765,7 +766,7 @@ void Menu::tick_menu()
+ input.reset_axis_config();
+ }
+ else if (SELECTED(ENTRY_BACK))
+- set_menu(&menu_controls, true);
++ menu_back();
+ }
+ else if (menu_selected == &menu_engine)
+ {
+@@ -775,7 +776,7 @@ void Menu::tick_menu()
+ else if (SELECTED(ENTRY_FREEPLAY)) config.engine.freeplay = !config.engine.freeplay;
+ else if (SELECTED(ENTRY_SUB_ENHANCEMENTS)) set_menu(&menu_enhancements);
+ else if (SELECTED(ENTRY_SUB_HANDLING)) set_menu(&menu_handling);
+- else if (SELECTED(ENTRY_BACK)) set_menu(&menu_settings, true);
++ else if (SELECTED(ENTRY_BACK)) menu_back();
+ }
+ else if (menu_selected == &menu_enhancements)
+ {
+@@ -783,7 +784,7 @@ void Menu::tick_menu()
+ else if (SELECTED(ENTRY_OBJECTS)) config.engine.level_objects ^= 1;
+ else if (SELECTED(ENTRY_PROTOTYPE)) config.engine.prototype ^= 1;
+ else if (SELECTED(ENTRY_TIMER)) config.engine.fix_timer ^= 1;
+- else if (SELECTED(ENTRY_BACK)) set_menu(&menu_engine, true);
++ else if (SELECTED(ENTRY_BACK)) menu_back();
+ }
+ else if (menu_selected == &menu_handling)
+ {
+@@ -792,7 +793,7 @@ void Menu::tick_menu()
+ else if (SELECTED(ENTRY_BUMPER)) config.engine.bumper ^= 1;
+ else if (SELECTED(ENTRY_TURBO)) config.engine.turbo ^= 1;
+ else if (SELECTED(ENTRY_COLOR)) { if (++config.engine.car_pal > 4) config.engine.car_pal = 0; }
+- else if (SELECTED(ENTRY_BACK)) set_menu(&menu_engine, true);
++ else if (SELECTED(ENTRY_BACK)) menu_back();
+ }
+ else if (menu_selected == &menu_musictest)
+ {
+@@ -818,7 +819,7 @@ void Menu::tick_menu()
+ {
+ cannonball::audio.clear_wav();
+ osoundint.queue_sound(sound::FM_RESET);
+- set_menu(config.smartypi.enabled ? &menu_s_tests : &menu_sound, true);
++ menu_back();
+ }
+ }
+ else
+@@ -839,22 +840,28 @@ bool Menu::select_pressed()
+ return input.has_pressed(Input::START) || input.has_pressed(Input::ACCEL) || input.has_pressed(Input::GEAR1);
+ }
+
+-// Set Current Menu
+-void Menu::set_menu(std::vector<std::string> *menu, bool back)
++void Menu::set_menu(std::vector<std::string> *menu)
+ {
++ menu_pair m;
++ m.cursor = cursor;
++ m.menu = menu_selected;
++ menu_stack.push_back(m);
++
+ menu_selected = menu;
++ cursor = 0;
++ is_text_menu = (menu == &menu_about);
++}
+
+- if (back && !cursor_stack.empty())
+- {
+- cursor = cursor_stack.back();
+- cursor_stack.pop_back();
+- }
+- else
++void Menu::menu_back()
++{
++ if (!menu_stack.empty())
+ {
+- cursor_stack.push_back(cursor);
+- cursor = 0;
++ menu_pair m = menu_stack.back();
++ cursor = m.cursor;
++ menu_selected = m.menu;
++ menu_stack.pop_back();
+ }
+- is_text_menu = (menu == &menu_about);
++ is_text_menu = (menu_selected == &menu_about);
+ }
+
+
+diff --git a/src/main/frontend/menu.hpp b/src/main/frontend/menu.hpp
+index ce1df702..655b7f03 100644
+--- a/src/main/frontend/menu.hpp
++++ b/src/main/frontend/menu.hpp
+@@ -60,7 +60,14 @@ class Menu
+
+ // Cursor
+ int16_t cursor;
+- std::vector<std::int16_t> cursor_stack;
++
++ struct menu_pair
++ {
++ int16_t cursor;
++ std::vector<std::string>* menu;
++ };
++
++ std::vector<menu_pair> menu_stack;
+
+ // Stores whether this is a textual menu (i.e. no options that can be chosen)
+ bool is_text_menu;
+@@ -98,7 +105,8 @@ class Menu
+ void draw_text(std::string);
+ void tick_menu();
+ bool select_pressed();
+- void set_menu(std::vector<std::string>*, bool back = false);
++ void set_menu(std::vector<std::string>*);
++ void menu_back();
+ void refresh_menu();
+ void set_menu_text(std::string s1, std::string s2);
+ void redefine_keyboard();
diff --git a/cannonball.spec b/cannonball.spec
index 3680d5b..1157129 100644
--- a/cannonball.spec
+++ b/cannonball.spec
@@ -1,6 +1,6 @@
Name: cannonball
Version: 0.34
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: An Enhanced OutRun Engine
License: MAME
@@ -12,6 +12,9 @@ Source1: %{name}.sh
Source2: %{name}_README.Fedora
Source3: %{name}.desktop
Source4: %{name}.appdata.xml
+# Better handling of 'back' state
+# https://github.com/djyt/cannonball/commit/135a0f3a56eedf13c5fea1d93711141...
+Patch0: %{name}-0.34-better_back_state.patch
BuildRequires: SDL2-devel
BuildRequires: cmake
@@ -104,6 +107,9 @@ appstream-util validate-relax --nonet \
%changelog
+* Sat Aug 05 2023 Andrea Musuruane <musuruan(a)gmail.com> - 0.34-6
+- Added a patch to improve handling of 'back' state. Fix FTBFS.
+
* Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.34-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 3 months
[fs-uae-arcade] Added new BR. Fix FTBFS.
by Andrea Musuruane
commit 146a2e5f14bca17525da45ba0f82e1ba85cd4cc8
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 5 08:48:08 2023 +0200
Added new BR. Fix FTBFS.
fs-uae-arcade.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/fs-uae-arcade.spec b/fs-uae-arcade.spec
index 2524b04..7b1e54f 100644
--- a/fs-uae-arcade.spec
+++ b/fs-uae-arcade.spec
@@ -2,7 +2,7 @@
Name: fs-uae-arcade
Version: 3.1.63
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Fullscreen game browser for FS-UAE
# The entire source code is GPLv2+ except oyoyo which is MIT
@@ -15,6 +15,7 @@ BuildArch: noarch
BuildRequires: make
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
@@ -84,6 +85,9 @@ ln -s %{_datadir}/fonts/liberation-sans/LiberationSans-Bold.ttf \
%changelog
+* Sat Aug 05 2023 Andrea Musuruane <musuruan(a)gmail.com> - 3.1.63-5
+- Added new BR. Fix FTBFS.
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.1.63-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 3 months
[fs-uae-launcher] Added new BR. Fix FTBFS.
by Andrea Musuruane
commit 39a608ff2bb0dcd77e7f12aa9001a8b939222b9b
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 5 08:39:00 2023 +0200
Added new BR. Fix FTBFS.
fs-uae-launcher.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/fs-uae-launcher.spec b/fs-uae-launcher.spec
index 8dba8f5..af91375 100644
--- a/fs-uae-launcher.spec
+++ b/fs-uae-launcher.spec
@@ -2,7 +2,7 @@
Name: fs-uae-launcher
Version: 3.1.66
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Graphical configuration frontend and launcher for FS-UAE
# The entire source code is GPLv2+ except oyoyo which is MIT
@@ -15,6 +15,7 @@ BuildArch: noarch
BuildRequires: make
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
@@ -103,6 +104,9 @@ ln -s %{_datadir}/fonts/liberation-sans/LiberationSans-Bold.ttf \
%changelog
+* Sat Aug 05 2023 Andrea Musuruane <musuruan(a)gmail.com> - 3.1.66-5
+- Added new BR. Fix FTBFS.
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.1.66-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 3 months
[pipewire-codec-aptx] Update to 0.3.77
by Nicolas Chauvet
commit 5f3bf15148e14c9c3e52da40d8180790a8c415c5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Aug 4 19:42:30 2023 +0200
Update to 0.3.77
pipewire-codec-aptx.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/pipewire-codec-aptx.spec b/pipewire-codec-aptx.spec
index 69a6a32..ea80a28 100644
--- a/pipewire-codec-aptx.spec
+++ b/pipewire-codec-aptx.spec
@@ -2,8 +2,8 @@
Name: pipewire-codec-aptx
Summary: PipeWire Bluetooth aptX codec plugin
-Version: 0.3.76
-Release: 2%{?dist}
+Version: 0.3.77
+Release: 1%{?dist}
License: MIT
URL: https://pipewire.org/
Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pip...
@@ -40,6 +40,9 @@ install -pm 0755 %{_vpath_builddir}/spa/plugins/bluez5/libspa-codec-bluez5-aptx.
%{_libdir}/spa-%{spaversion}/bluez5/libspa-codec-bluez5-aptx.so
%changelog
+* Fri Aug 04 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 0.3.77-1
+- Update to 0.3.77
+
* Thu Aug 03 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 0.3.76-2
- Relax version requirement
diff --git a/sources b/sources
index 3d827fb..129341a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pipewire-0.3.76.tar.gz) = 2f6a3d8b7d466bccd2faab97accd77bb73c2edd8f88fd5e05d7ee1a7d418d0fb125d798307068ecc150bff015bb5367f371edd4abe273344d32988c854cd8c79
+SHA512 (pipewire-0.3.77.tar.gz) = 9bb41520d162a3925042f62934244c951b229951b25682d4489c72957827d0a5203edc784a7bf59e30e43f677405626994b03cf186ffb7b0b53f7ca569eb10e2
1 year, 3 months
[EmptyEpsilon] Fix gcc compile issue and deps problem
by Leigh Scott
commit be4bc7b8cf268f255fe8b8f031dce46ec7fcc082
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 4 14:15:18 2023 +0100
Fix gcc compile issue and deps problem
EmptyEpsilon.spec | 35 ++++++++++++++++++-----------------
gcc12.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 17 deletions(-)
---
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index b61c417..a265d9f 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -8,14 +8,14 @@ Version: %{version_major}.%{version_minor}.%{version_patch}
Release: 5%{?dist}
License: GPLv2
-BuildRequires: cmake3
+BuildRequires: cmake
+BuildRequires: dos2unix
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,7 +26,7 @@ Source1: https://github.com/daid/SeriousProton/archive/EE-%{version}.zip#
# EmptyEpsilon downstream patches:
-#Patch1:
+Patch1: gcc12.patch
# SeriousProton downstream patches:
#Patch20:
@@ -61,34 +61,36 @@ Note: Network play require port 35666 UDP and TCP allowed in firewall.
%prep
%setup -q -a 1 -n EmptyEpsilon-EE-%{version}
+dos2unix SeriousProton-EE-2021.06.23/src/httpServer.cpp \
+ SeriousProton-EE-2021.06.23/src/scriptInterfaceMagic.cpp
-%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 1 -p1
+%patch 40 -p1
+%patch 41 -p1
+%patch 42 -p1
+%patch 43 -p1
+%patch 60 -p1 -d SeriousProton-EE-%{version}
+%patch 61 -p1 -d SeriousProton-EE-%{version}
+%patch 62 -p1 -d SeriousProton-EE-%{version}
+%patch 63 -p1 -d SeriousProton-EE-%{version}
+%patch 64 -p1 -d SeriousProton-EE-%{version}
%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
@@ -184,4 +186,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
* Wed Feb 15 2017 Jan Kalina <jkalina(a)redhat.com> - 2017.01.19-3
- New package built, applied fixes from fedora review
-
diff --git a/gcc12.patch b/gcc12.patch
new file mode 100644
index 0000000..11660c2
--- /dev/null
+++ b/gcc12.patch
@@ -0,0 +1,39 @@
+--- a/SeriousProton-EE-2021.06.23/src/httpServer.cpp
++++ b/SeriousProton-EE-2021.06.23/src/httpServer.cpp
+@@ -1,5 +1,6 @@
+ #include <string.h>
+ #include <stdio.h>
++#include <cstdint>
+
+ #include "httpServer.h"
+ #include "logging.h"
+
+--- a/SeriousProton-EE-2021.06.23/src/multiplayer.h
++++ b/SeriousProton-EE-2021.06.23/src/multiplayer.h
+@@ -4,6 +4,7 @@
+ #include <SFML/Network.hpp>
+ #include <SFML/Graphics/Color.hpp>
+ #include <stdint.h>
++#include <cstdint>
+ #include "Updatable.h"
+ #include "stringImproved.h"
+
+--- a/SeriousProton-EE-2021.06.23/src/scriptInterfaceMagic.cpp
++++ b/SeriousProton-EE-2021.06.23/src/scriptInterfaceMagic.cpp
+@@ -1,4 +1,5 @@
+ #include "scriptInterfaceMagic.h"
++#include <cstdint>
+
+ ScriptClassInfo* scriptClassInfoList;
+
+
+--- a/SeriousProton-EE-2021.06.23/src/fixedSocket.h
++++ b/SeriousProton-EE-2021.06.23/src/fixedSocket.h
+@@ -3,6 +3,7 @@
+
+ #include <SFML/Network.hpp>
+ #include <list>
++#include <cstdint>
+
+ //The sf::TcpSocket has some problems with sending partial packets when the the OS buffers are full.
+ //The TcpSocket of SeriousProton solves this by storing the partial packet in a buffer, and storing all other packets after that as well.
1 year, 3 months
[deadbeef] Fix Build for F39.
by Vasiliy Glazov
commit 3ceb750cde18f40cfeca32504f1cfc203b1df480
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Fri Aug 4 14:46:59 2023 +0300
Fix Build for F39.
deadbeef.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/deadbeef.spec b/deadbeef.spec
index 3422483..812d4c0 100644
--- a/deadbeef.spec
+++ b/deadbeef.spec
@@ -1,5 +1,6 @@
%global toolchain clang
%global optflags %optflags -Wno-unused-but-set-variable -Wno-unused-variable
+%global build_cxxflags %build_cxxflags -std=c++11
# Git submodules
%global mp4p_commit 97ab7285d244de9cde6333e381f9f797b89ce8aa
@@ -13,7 +14,7 @@
Name: deadbeef
Version: 1.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An audio player for GNU/Linux
License: GPL-2.0-or later AND LGPL-2.0-or-later and BSD and MIT AND Zlib
@@ -172,6 +173,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Fri Aug 04 2023 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.9.5-4
+- Fix Build for F39
+
* Tue Aug 01 2023 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.9.5-3
- Add mpris plugin to recommends
1 year, 3 months