Gentoo Archives: gentoo-commits

From: "Hanno Böck" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: lxde-base/menu-cache/files/, lxde-base/menu-cache/
Date: Tue, 28 Jan 2020 18:48:44
Message-Id: 1580237308.a74fcbfb42c449c92d8cf451b915b0dfe7252318.hanno@gentoo
1 commit: a74fcbfb42c449c92d8cf451b915b0dfe7252318
2 Author: Hanno Böck <hanno <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 28 18:48:28 2020 +0000
4 Commit: Hanno Böck <hanno <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 28 18:48:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74fcbfb
7
8 lxde-base/menu-cache: Fix -fno-common compilation.
9
10 Patch from upstream pull request.
11
12 Closes: https://bugs.gentoo.org/706884
13 Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
14 Package-Manager: Portage-2.3.86, Repoman-2.3.20
15
16 .../files/menu-cache-1.1.0-fno-common.diff | 88 ++++++++++++++++++++++
17 lxde-base/menu-cache/menu-cache-1.1.0.ebuild | 6 +-
18 2 files changed, 93 insertions(+), 1 deletion(-)
19
20 diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
21 new file mode 100644
22 index 00000000000..aa12997026c
23 --- /dev/null
24 +++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
25 @@ -0,0 +1,88 @@
26 +diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
27 +index f3fd7d3..f71c0bc 100644
28 +--- a/menu-cache-gen/menu-tags.h
29 ++++ b/menu-cache-gen/menu-tags.h
30 +@@ -22,38 +22,17 @@
31 + #include <libfm/fm-extra.h>
32 + #include <menu-cache.h>
33 +
34 +-FmXmlFileTag menuTag_Menu;
35 +-FmXmlFileTag menuTag_AppDir;
36 +-FmXmlFileTag menuTag_DefaultAppDirs;
37 +-FmXmlFileTag menuTag_DirectoryDir;
38 +-FmXmlFileTag menuTag_DefaultDirectoryDirs;
39 +-FmXmlFileTag menuTag_Include;
40 +-FmXmlFileTag menuTag_Exclude;
41 +-FmXmlFileTag menuTag_Filename;
42 +-FmXmlFileTag menuTag_Or;
43 +-FmXmlFileTag menuTag_And;
44 +-FmXmlFileTag menuTag_Not;
45 +-FmXmlFileTag menuTag_Category;
46 +-FmXmlFileTag menuTag_MergeFile;
47 +-FmXmlFileTag menuTag_MergeDir;
48 +-FmXmlFileTag menuTag_DefaultMergeDirs;
49 +-FmXmlFileTag menuTag_Directory;
50 +-FmXmlFileTag menuTag_Name;
51 +-FmXmlFileTag menuTag_Deleted;
52 +-FmXmlFileTag menuTag_NotDeleted;
53 +-FmXmlFileTag menuTag_OnlyUnallocated;
54 +-FmXmlFileTag menuTag_NotOnlyUnallocated;
55 +-FmXmlFileTag menuTag_All;
56 +-FmXmlFileTag menuTag_LegacyDir;
57 +-FmXmlFileTag menuTag_KDELegacyDirs;
58 +-FmXmlFileTag menuTag_Move;
59 +-FmXmlFileTag menuTag_Old;
60 +-FmXmlFileTag menuTag_New;
61 +-FmXmlFileTag menuTag_Layout;
62 +-FmXmlFileTag menuTag_DefaultLayout;
63 +-FmXmlFileTag menuTag_Menuname;
64 +-FmXmlFileTag menuTag_Separator;
65 +-FmXmlFileTag menuTag_Merge;
66 ++extern FmXmlFileTag menuTag_AppDir;
67 ++extern FmXmlFileTag menuTag_DirectoryDir;
68 ++extern FmXmlFileTag menuTag_Include;
69 ++extern FmXmlFileTag menuTag_Exclude;
70 ++extern FmXmlFileTag menuTag_Filename;
71 ++extern FmXmlFileTag menuTag_Or;
72 ++extern FmXmlFileTag menuTag_And;
73 ++extern FmXmlFileTag menuTag_Not;
74 ++extern FmXmlFileTag menuTag_Category;
75 ++extern FmXmlFileTag menuTag_All;
76 ++extern FmXmlFileTag menuTag_LegacyDir;
77 +
78 + typedef enum {
79 + MERGE_NONE, /* starting value */
80 +@@ -152,19 +131,19 @@ typedef struct {
81 + } MenuRule;
82 +
83 + /* requested language(s) */
84 +-char **languages;
85 ++extern char **languages;
86 +
87 + /* list of menu files to monitor */
88 +-GSList *MenuFiles;
89 ++extern GSList *MenuFiles;
90 +
91 + /* list of menu dirs to monitor */
92 +-GSList *MenuDirs;
93 ++extern GSList *MenuDirs;
94 +
95 + /* list of available app dirs */
96 +-GSList *AppDirs;
97 ++extern GSList *AppDirs;
98 +
99 + /* list of available dir dirs */
100 +-GSList *DirDirs;
101 ++extern GSList *DirDirs;
102 +
103 + /* parse and merge menu files */
104 + MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
105 +@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
106 + void _free_layout_items(GList *data);
107 +
108 + /* verbosity level */
109 +-gint verbose;
110 ++extern gint verbose;
111 +
112 + #define DBG if (verbose) g_debug
113 + #define VDBG if (verbose > 1) g_debug
114
115 diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
116 index 2c03125682e..17e172fb352 100644
117 --- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
118 +++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
119 @@ -1,4 +1,4 @@
120 -# Copyright 1999-2019 Gentoo Authors
121 +# Copyright 1999-2020 Gentoo Authors
122 # Distributed under the terms of the GNU General Public License v2
123
124 EAPI=6
125 @@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
126 sys-devel/gettext
127 virtual/pkgconfig"
128
129 +# Fix for gcc 10 / -fno-common
130 +# https://github.com/lxde/menu-cache/pull/19
131 +PATCHES="${FILESDIR}/${P}-fno-common.diff"
132 +
133 src_configure() {
134 econf "--disable-static"
135 }