commit 32ed2e2d637d96a3e558f8947e33af87e1a5ba95 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Tue Jul 30 16:56:35 2024 +0200 Updated to upstream 0.80.1 .gitignore | 1 + Plus4.png | Bin 456 -> 0 bytes sources | 2 +- yapeSDL-0.80.1-force_machine_switch.patch | 29 +++++++++++++++++++++ yapeSDL.spec | 41 +++++++++++++++--------------- 5 files changed, 52 insertions(+), 21 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3cae724..1c15de9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ yapeSDL-0.58.2.zip /yapeSDL-0.70.1.zip /yapeSDL-0.70.2.tar.gz /yapeSDL-0.71.2.tar.gz +/yapeSDL-0.80.1.tar.gz diff --git a/sources b/sources index 52c0b88..e932c3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yapeSDL-0.71.2.tar.gz) = bfa685c77c74ea80007bb1a9125585c5e7c7bd48ddf383a077fc3dec350fbc5b75f90cd4b6cb0141b94047cdc4f736d5722ea748c7ab4299bfc75fd204f70e4d +SHA512 (yapeSDL-0.80.1.tar.gz) = 745f09b6153ca08b301903738bf138d678e72ca9cb17947df529ac98b87522b6b8b8f52ea75a5a16db293eb0d6924282f4ac54e1ec858e2ba9b03fb367da7ea5 diff --git a/yapeSDL-0.80.1-force_machine_switch.patch b/yapeSDL-0.80.1-force_machine_switch.patch new file mode 100644 index 0000000..79af457 --- /dev/null +++ b/yapeSDL-0.80.1-force_machine_switch.patch @@ -0,0 +1,29 @@ +From f28839b5d51c9a86bfe850b2278db06daba42709 Mon Sep 17 00:00:00 2001 +From: calmopyrin <calmopyrin(a)users.noreply.github.com&gt; +Date: Sat, 20 Jul 2024 15:56:53 +0200 +Subject: [PATCH] Force machine switch + +Force switch when dialog window fails to show (Linux SDL issue) +--- + main.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/main.cpp b/main.cpp +index 0719799..e322ebf 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -852,9 +852,11 @@ static void confirmEmulationLevelChange(unsigned int shiftPressed) + NULL + }; + +- if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) +- SDL_Log("error opening window"); +- else if (buttonid == 0) ++ if (SDL_ShowMessageBox(&messageboxdata, &buttonid) < 0) { ++ SDL_Log("Error opening window: %s\n", SDL_GetError()); ++ buttonid = 0; ++ } ++ if (buttonid == 0) + #endif + { + char name[64]; diff --git a/yapeSDL.spec b/yapeSDL.spec index e92cb6a..59858d0 100644 --- a/yapeSDL.spec +++ b/yapeSDL.spec @@ -1,27 +1,20 @@ Name: yapeSDL -Version: 0.71.2 -Release: 3%{?dist} +Version: 0.80.1 +Release: 1%{?dist} Summary: A Commodore 264 family (C16, plus/4 etc.) emulator -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/calmopyrin/yapesdl Source: https://github.com/calmopyrin/yapesdl/archive/v%{version}.tar.gz#/%{name}... Source1: %{name}.desktop -# Icon taken from -# http://ahlberg.deviantart.com/art/Commodore-Icons-70563314 -# License: -# These icons are FREE! Feel free to use them in your applications, -# on your site, signature on a forum or whatever. -Source2: Plus4.png -Source3: %{name}.appdata.xml +Source2: %{name}.appdata.xml +# Force switch when dialog window fails to show +# https://github.com/calmopyrin/yapesdl/commit/f28839b5d51c9a86bfe850b2278d... +Patch0: %{name}-0.80.1-force_machine_switch.patch BuildRequires: gcc-c++ BuildRequires: SDL2-devel -%if 0%{?fedora} >= 30 BuildRequires: minizip-compat-devel -%else -BuildRequires: minizip-devel -%endif BuildRequires: desktop-file-utils BuildRequires: libappstream-glib Requires: hicolor-icon-theme @@ -47,12 +40,15 @@ Features: - snapshots / savestates %prep -%setup -q -n yapesdl-%{version} +%autosetup -n yapesdl-%{version} -p1 # Fix UTF-8 encoding iconv --from=ISO-8859-1 --to=UTF-8 README.SDL > README.SDL.utf8 mv README.SDL.utf8 README.SDL +# Remove bundled libs +rm -rf zlib + # Fix unzip.h include path sed -i 's!#include "zlib/unzip.h"!#include "minizip/unzip.h"!' archdep.cpp @@ -85,23 +81,28 @@ desktop-file-install \ # Install icon install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png +install -p -m 644 plus4.xcassets/MacAppIcon.appiconset/icon_32x32.png \ + %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png # Install AppData file -install -d %{buildroot}%{_datadir}/metainfo -install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/metainfo -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml +install -d %{buildroot}%{_metainfodir} +install -p -m 644 %{SOURCE2} %{buildroot}%{_metainfodir} +appstream-util validate-relax --nonet \ + %{buildroot}%{_metainfodir}/%{name}.appdata.xml %files %{_bindir}/yapesdl %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{_datadir}/metainfo/%{name}.appdata.xml +%{_metainfodir}/%{name}.appdata.xml %doc Changes README.SDL %license COPYING %changelog +* Tue Jul 30 2024 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.80.1-1 +- Updated to upstream 0.80.1 + * Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0.71.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild