x11-plugins/fsviewer: fix build with -fno-common

Closes: https://bugs.gentoo.org/706972
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
new file mode 100644 (file)
index 0000000..00c5e65
--- /dev/null
+++ b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
@@ -0,0 +1,26 @@
+diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
+--- fsviewer-app-0.2.6.orig/src/FSViewer.c     2007-10-14 17:29:04.000000000 +0200
++++ fsviewer-app-0.2.6/src/FSViewer.c  2020-02-03 00:20:37.979716353 +0100
+@@ -25,6 +25,8 @@
+ static Bool      focusIn;
+ int ModifierFromKey(Display *dpy, char *key);
+ 
++WMUserDefaults *defaultsDB;
++WMPropList *filesDB;
+ void
+ wAbort(Bool foo)
+ {
+diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.h fsviewer-app-0.2.6/src/FSViewer.h
+--- fsviewer-app-0.2.6.orig/src/FSViewer.h     2006-07-23 09:24:15.000000000 +0200
++++ fsviewer-app-0.2.6/src/FSViewer.h  2020-02-03 00:20:39.299718025 +0100
+@@ -123,8 +123,8 @@
+ } CallbackRec;
+ 
+ /* Application defaults */
+-WMUserDefaults *defaultsDB;
+-WMPropList *filesDB;
++extern WMUserDefaults *defaultsDB;
++extern WMPropList *filesDB;
+ 
+ /* all Panels must start with the following layout */
+ typedef struct PanelRec {

diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
index 83bc210ced4dadbc13fdfc1d402e838d0f5de3df..9e5972eaf1e1ed27af02925588c4e94e49fd85d6 100644 (file)
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-gcc5.patch
        "${FILESDIR}"/${P}-wmaker-0.95_support.patch
        "${FILESDIR}"/${P}-fix_title_bar.patch
+       "${FILESDIR}"/${P}-gcc-10.patch
 )
 DOCS="AUTHORS ChangeLog NEWS README"