summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/fuse/files/multiple-definition.patch13
-rw-r--r--app-emulation/fuse/fuse-1.5.7.ebuild1
2 files changed, 14 insertions, 0 deletions
diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch
new file mode 100644
index 000000000000..8a8e9d7d1758
--- /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 ffc3cfaeb973..b75ae1134c58 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
)