[gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/, app-emulation/fuse/files/

[Joonas Niilola]

commit:     6ca492771eb090c1856ce41c499be90d4e89d3f6
Author:     Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com>
AuthorDate: Sun Sep 20 13:48:48 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 07:22:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca49277

app-emulation/fuse: fix building with GCC 10

Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/fuse/files/multiple-definition.patch | 13 +++++++++++++
 app-emulation/fuse/fuse-1.5.7.ebuild               |  1 +
 2 files changed, 14 insertions(+)

diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch
new file mode 100644
index 00000000000..8a8e9d7d175
--- /dev/null
+++ b/app-emulation/fuse/files/multiple-definition.patch
@@ -0,0 +1,13 @@
+diff -Naur fuse-1.5.7/ui/widget/widget.c fuse-1.5.7-patched/ui/widget/widget.c
+--- fuse-1.5.7/ui/widget/widget.c	2018-08-06 15:36:04.000000000 +0200
++++ fuse-1.5.7-patched/ui/widget/widget.c	2020-09-20 15:27:42.045382588 +0200
+@@ -90,9 +90,6 @@
+ 
+ static widget_recurse_t widget_return[10]; /* The stack to recurse on */
+ 
+-/* The settings used whilst playing with an options dialog box */
+-settings_info widget_options_settings;
+-
+ static int widget_read_font( const char *filename )
+ {
+   utils_file file;

diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild
index ffc3cfaeb97..b75ae1134c5 100644
--- a/app-emulation/fuse/fuse-1.5.7.ebuild
+++ b/app-emulation/fuse/fuse-1.5.7.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README THANKS )
 
 PATCHES=(
+	"${FILESDIR}"/multiple-definition.patch
 	"${FILESDIR}"/remove-local-prefix.patch
 )