[SheepShaver] Fix FTBFS
commit 993f6c751ebbb32f90c79d934dba97ab4832903b
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 10 21:55:27 2020 +0100
Fix FTBFS
SheepShaver.spec | 19 +++++--------------
macemu-gcc10.patch | 12 ++++++++++++
2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/SheepShaver.spec b/SheepShaver.spec
index 1a16269..85e9021 100644
--- a/SheepShaver.spec
+++ b/SheepShaver.spec
@@ -8,13 +8,14 @@
Summary: Power Macintosh emulator
Name: SheepShaver
Version: 2.4
-Release: 0.10.%{date}%{?dist}
+Release: 0.11.%{date}%{?dist}
License: GPLv2+
URL: http://sheepshaver.cebix.net/
Source0:
https://github.com/cebix/macemu/archive/%{commit}/BasiliskII-1.0-%{shortc...
Source1: %{name}.desktop
Source2: %{name}.png
Source3: %{name}.appdata.xml
+Patch1: macemu-gcc10.patch
# Patch 10+ because these are for cxmon
Patch10: cxmon-3.2-hide-symbols.patch
Patch11: cxmon-3.2-strfmt.patch
@@ -77,19 +78,6 @@ appstream-util validate-relax --nonet \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%files
%doc %{name}/NEWS %{name}/doc/Linux/*
%license %{name}/COPYING
@@ -104,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%changelog
+* Tue Mar 10 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.11.20171001
+- Fix FTBFS
+
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
2.4-0.10.20171001
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/macemu-gcc10.patch b/macemu-gcc10.patch
new file mode 100644
index 0000000..73f1bfb
--- /dev/null
+++ b/macemu-gcc10.patch
@@ -0,0 +1,12 @@
+diff -up macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/video.cpp~
macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/video.cpp
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/video.cpp~ 2017-09-04
20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/video.cpp 2020-03-10
19:38:26.940545605 +0100
+@@ -741,7 +741,7 @@ static int16 VideoStatus(uint32 pb, VidL
+ case kDisplayModeIDCurrent:
+ work_id = csSave->saveData;
+ break;
+- case kDisplayModeIDFindFirstResolution:
++ case (int)kDisplayModeIDFindFirstResolution:
+ work_id = APPLE_ID_MIN;
+ while (!has_mode(work_id))
+ work_id ++;