diff options
| author |   Jan Ziak <0xe2.0x9a.0x9b@gmail.com> | 2020-09-20 15:48:48 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-10-10 10:22:33 +0300 |
| commit | 6ca492771eb090c1856ce41c499be90d4e89d3f6 (patch) | |
| tree | 4b5e217c52a02b87d128c33c7da4a22993498ed9 /app-emulation | |
| parent | app-emulation/fuse: drop old (diff) | |
| download | gentoo-6ca492771eb090c1856ce41c499be90d4e89d3f6.tar.gz gentoo-6ca492771eb090c1856ce41c499be90d4e89d3f6.tar.bz2 gentoo-6ca492771eb090c1856ce41c499be90d4e89d3f6.zip | |
app-emulation/fuse: fix building with GCC 10
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/fuse/files/multiple-definition.patch | 13 | ||||
| -rw-r--r-- | app-emulation/fuse/fuse-1.5.7.ebuild | 1 |
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 ) |