[xroar] Fix FTBFS
commit c05f7c5516c628887ba4f94d710635f5b61b89e8
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 17 20:01:08 2020 +0100
Fix FTBFS
xroar-0.35.4-fcommon-fix.patch | 24 ++++++++++++++++++++++++
xroar.spec | 8 ++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/xroar-0.35.4-fcommon-fix.patch b/xroar-0.35.4-fcommon-fix.patch
new file mode 100644
index 0000000..f2acb7c
--- /dev/null
+++ b/xroar-0.35.4-fcommon-fix.patch
@@ -0,0 +1,24 @@
+diff -up xroar-0.35.4/src/vdisk.h~ xroar-0.35.4/src/vdisk.h
+--- xroar-0.35.4/src/vdisk.h~ 2019-03-29 07:51:23.000000000 +0100
++++ xroar-0.35.4/src/vdisk.h 2020-03-17 19:26:09.442092064 +0100
+@@ -40,7 +40,7 @@ enum vdisk_err {
+ vdisk_err_idam_crc,
+ vdisk_err_data_crc,
+ vdisk_err_max
+-} vdisk_errno;
++};
+
+ /*
+ * If write_back is not set, the image file will not be updated when the disk
+diff -up xroar-0.35.4/src/vdisk.c~ xroar-0.35.4/src/vdisk.c
+--- xroar-0.35.4/src/vdisk.c~ 2019-05-13 21:43:11.000000000 +0200
++++ xroar-0.35.4/src/vdisk.c 2020-03-17 19:38:01.041359792 +0100
+@@ -100,6 +100,8 @@ static const uint8_t vdk_header[12] = {
+ 0x00, // name length & compression flag, populated later
+ };
+
++static enum vdisk_err vdisk_errno;
++
+ const char *vdisk_strerror(int errnum) {
+ if (errnum < 0 || errnum > vdisk_err_max)
+ errnum = vdisk_err_max;
diff --git a/xroar.spec b/xroar.spec
index 26cf715..6ff17de 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,6 +1,6 @@
Name: xroar
Version: 0.35.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv2+
URL: http://www.6809.org.uk/xroar/
@@ -9,6 +9,7 @@ Source1: http://www.6809.org.uk/dragon/dragon.rom
Source2: %{name}.desktop
Source3: %{name}-minifirm.desktop
Source4: %{name}.appdata.xml
+Patch1: xroar-0.35.4-fcommon-fix.patch
BuildRequires: gcc
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -34,7 +35,7 @@ minimal firmware is included.
%prep
-%setup -q
+%autosetup -p1
%build
@@ -96,6 +97,9 @@ rm -f %{buildroot}%{_infodir}/dir
%changelog
+* Tue Mar 17 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.35.4-4
+- Fix FTBFS
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
0.35.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild