Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/fsviewer/files/, x11-plugins/fsviewer/
Date: Sun, 02 Feb 2020 23:23:51
Message-Id: 1580685810.4f43ddf429a1b442a48890b348583330ad99936b.voyageur@gentoo
1 commit: 4f43ddf429a1b442a48890b348583330ad99936b
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 2 23:23:18 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 2 23:23:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f43ddf4
7
8 x11-plugins/fsviewer: fix build with -fno-common
9
10 Closes: https://bugs.gentoo.org/706972
11 Package-Manager: Portage-2.3.87, Repoman-2.3.20
12 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
13
14 .../fsviewer/files/fsviewer-0.2.6-gcc-10.patch | 26 ++++++++++++++++++++++
15 x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild | 3 ++-
16 2 files changed, 28 insertions(+), 1 deletion(-)
17
18 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
19 new file mode 100644
20 index 00000000000..00c5e651e69
21 --- /dev/null
22 +++ b/x11-plugins/fsviewer/files/fsviewer-0.2.6-gcc-10.patch
23 @@ -0,0 +1,26 @@
24 +diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.c fsviewer-app-0.2.6/src/FSViewer.c
25 +--- fsviewer-app-0.2.6.orig/src/FSViewer.c 2007-10-14 17:29:04.000000000 +0200
26 ++++ fsviewer-app-0.2.6/src/FSViewer.c 2020-02-03 00:20:37.979716353 +0100
27 +@@ -25,6 +25,8 @@
28 + static Bool focusIn;
29 + int ModifierFromKey(Display *dpy, char *key);
30 +
31 ++WMUserDefaults *defaultsDB;
32 ++WMPropList *filesDB;
33 + void
34 + wAbort(Bool foo)
35 + {
36 +diff -Naur fsviewer-app-0.2.6.orig/src/FSViewer.h fsviewer-app-0.2.6/src/FSViewer.h
37 +--- fsviewer-app-0.2.6.orig/src/FSViewer.h 2006-07-23 09:24:15.000000000 +0200
38 ++++ fsviewer-app-0.2.6/src/FSViewer.h 2020-02-03 00:20:39.299718025 +0100
39 +@@ -123,8 +123,8 @@
40 + } CallbackRec;
41 +
42 + /* Application defaults */
43 +-WMUserDefaults *defaultsDB;
44 +-WMPropList *filesDB;
45 ++extern WMUserDefaults *defaultsDB;
46 ++extern WMPropList *filesDB;
47 +
48 + /* all Panels must start with the following layout */
49 + typedef struct PanelRec {
50
51 diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
52 index 83bc210ced4..9e5972eaf1e 100644
53 --- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
54 +++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
55 @@ -1,4 +1,4 @@
56 -# Copyright 1999-2018 Gentoo Foundation
57 +# Copyright 1999-2020 Gentoo Authors
58 # Distributed under the terms of the GNU General Public License v2
59
60 EAPI=6
61 @@ -30,6 +30,7 @@ PATCHES=(
62 "${FILESDIR}"/${P}-gcc5.patch
63 "${FILESDIR}"/${P}-wmaker-0.95_support.patch
64 "${FILESDIR}"/${P}-fix_title_bar.patch
65 + "${FILESDIR}"/${P}-gcc-10.patch
66 )
67 DOCS="AUTHORS ChangeLog NEWS README"