diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2020-01-28 19:48:28 +0100 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2020-01-28 19:48:28 +0100 |
| commit | a74fcbfb42c449c92d8cf451b915b0dfe7252318 (patch) | |
| tree | e5ed5db75e64203110c4b9ab13dc8e2d5dd919e8 /lxde-base/menu-cache/files | |
| parent | sys-kernel/gentoo-kernel-bin: Bump to 4.19.99 (diff) | |
| download | gentoo-a74fcbfb42c449c92d8cf451b915b0dfe7252318.tar.gz gentoo-a74fcbfb42c449c92d8cf451b915b0dfe7252318.tar.bz2 gentoo-a74fcbfb42c449c92d8cf451b915b0dfe7252318.zip | |
lxde-base/menu-cache: Fix -fno-common compilation.
Patch from upstream pull request.
Closes: https://bugs.gentoo.org/706884
Signed-off-by: Hanno Böck <hanno@gentoo.org>
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Diffstat (limited to 'lxde-base/menu-cache/files')
| -rw-r--r-- | lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff | 88 |
1 files changed, 88 insertions, 0 deletions
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 new file mode 100644 index 000000000000..aa12997026c3 --- /dev/null +++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff @@ -0,0 +1,88 @@ +diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h +index f3fd7d3..f71c0bc 100644 +--- a/menu-cache-gen/menu-tags.h ++++ b/menu-cache-gen/menu-tags.h +@@ -22,38 +22,17 @@ + #include <libfm/fm-extra.h> + #include <menu-cache.h> + +-FmXmlFileTag menuTag_Menu; +-FmXmlFileTag menuTag_AppDir; +-FmXmlFileTag menuTag_DefaultAppDirs; +-FmXmlFileTag menuTag_DirectoryDir; +-FmXmlFileTag menuTag_DefaultDirectoryDirs; +-FmXmlFileTag menuTag_Include; +-FmXmlFileTag menuTag_Exclude; +-FmXmlFileTag menuTag_Filename; +-FmXmlFileTag menuTag_Or; +-FmXmlFileTag menuTag_And; +-FmXmlFileTag menuTag_Not; +-FmXmlFileTag menuTag_Category; +-FmXmlFileTag menuTag_MergeFile; +-FmXmlFileTag menuTag_MergeDir; +-FmXmlFileTag menuTag_DefaultMergeDirs; +-FmXmlFileTag menuTag_Directory; +-FmXmlFileTag menuTag_Name; +-FmXmlFileTag menuTag_Deleted; +-FmXmlFileTag menuTag_NotDeleted; +-FmXmlFileTag menuTag_OnlyUnallocated; +-FmXmlFileTag menuTag_NotOnlyUnallocated; +-FmXmlFileTag menuTag_All; +-FmXmlFileTag menuTag_LegacyDir; +-FmXmlFileTag menuTag_KDELegacyDirs; +-FmXmlFileTag menuTag_Move; +-FmXmlFileTag menuTag_Old; +-FmXmlFileTag menuTag_New; +-FmXmlFileTag menuTag_Layout; +-FmXmlFileTag menuTag_DefaultLayout; +-FmXmlFileTag menuTag_Menuname; +-FmXmlFileTag menuTag_Separator; +-FmXmlFileTag menuTag_Merge; ++extern FmXmlFileTag menuTag_AppDir; ++extern FmXmlFileTag menuTag_DirectoryDir; ++extern FmXmlFileTag menuTag_Include; ++extern FmXmlFileTag menuTag_Exclude; ++extern FmXmlFileTag menuTag_Filename; ++extern FmXmlFileTag menuTag_Or; ++extern FmXmlFileTag menuTag_And; ++extern FmXmlFileTag menuTag_Not; ++extern FmXmlFileTag menuTag_Category; ++extern FmXmlFileTag menuTag_All; ++extern FmXmlFileTag menuTag_LegacyDir; + + typedef enum { + MERGE_NONE, /* starting value */ +@@ -152,19 +131,19 @@ typedef struct { + } MenuRule; + + /* requested language(s) */ +-char **languages; ++extern char **languages; + + /* list of menu files to monitor */ +-GSList *MenuFiles; ++extern GSList *MenuFiles; + + /* list of menu dirs to monitor */ +-GSList *MenuDirs; ++extern GSList *MenuDirs; + + /* list of available app dirs */ +-GSList *AppDirs; ++extern GSList *AppDirs; + + /* list of available dir dirs */ +-GSList *DirDirs; ++extern GSList *DirDirs; + + /* parse and merge menu files */ + MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error); +@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil + void _free_layout_items(GList *data); + + /* verbosity level */ +-gint verbose; ++extern gint verbose; + + #define DBG if (verbose) g_debug + #define VDBG if (verbose > 1) g_debug |