Notification time stamped 2020-05-31 21:36:30 UTC
From 4c35f5d2bdc1fd6ddddf565951fd9544b4a3382d Mon Sep 17 00:00:00 2001
From: Wade Berrier <wberrier(a)gmail.com>
Date: May 24 2020 14:53:13 +0000
Subject: mupen64plus: fix build with gcc10
Thanks to commenters in bug
https://bugzilla.redhat.com/show_bug.cgi?id=1535549 for finding the
upstream patch.
---
diff --git a/mupen64plus-multiple-definitions.patch
b/mupen64plus-multiple-definitions.patch
new file mode 100644
index 0000000..96fe0a9
--- /dev/null
+++ b/mupen64plus-multiple-definitions.patch
@@ -0,0 +1,11 @@
+diff -ur mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h
mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h
+---
mupen64plus-bundle-src-2.5.orig/source/mupen64plus-core/src/main/workqueue.h 2015-04-26
16:42:49.000000000 -0600
++++ mupen64plus-bundle-src-2.5/source/mupen64plus-core/src/main/workqueue.h 2020-05-24
08:45:41.743484866 -0600
+@@ -27,7 +27,6 @@
+
+ struct work_struct;
+
+-struct work_struct *work;
+ typedef void (*work_func_t)(struct work_struct *work);
+ struct work_struct {
+ work_func_t func;
diff --git a/mupen64plus.spec b/mupen64plus.spec
index c20a7c8..10d5bde 100644
--- a/mupen64plus.spec
+++ b/mupen64plus.spec
@@ -9,6 +9,7 @@ Summary: Nintendo 64 Emulator
License: GPLv2+ and CC-BY-SA
URL:
http://www.mupen64plus.org/
Source:
https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5/mup...
+Patch1: mupen64plus-multiple-definitions.patch
BuildRequires: pkgconfig(SDL_ttf)
@@ -43,6 +44,7 @@ Development files for mupen64plus
%prep
%setup -q -n %{name}-bundle-src-%{version}
+%patch1 -p1 -b.multipledefinitions
# Need to avoid filename conflicts so they can be included in the package
cp -a source/mupen64plus-rsp-hle/LICENSES LICENSE-rsp-hle
@@ -96,6 +98,9 @@ desktop-file-validate
%{buildroot}/%{_datadir}/applications/mupen64plus.desktop
%changelog
+* Sun May 24 2020 Wade Berrier <wberrier(a)gmail.com> - 2.5-6
+- Fix build with gcc 10
+
* Sat Apr 25 2020 Wade Berrier <wberrier(a)gmail.com> - 2.5-5
- Add gcc-c++ to BuildRequires
https://src.fedoraproject.org/rpms/mupen64plus/c/4c35f5d2bdc1fd6ddddf5659...