wok-current annotate menu-cache/stuff/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch @ rev 25788

Mass update to fix build with gcc10 and up others packages
author Stanislas Leduc <shann@slitaz.org>
date Tue Sep 30 07:43:04 2025 +0000 (3 weeks ago)
parents
children
rev   line source
shann@25788 1 From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001
shann@25788 2 From: Mamoru TASAKA <mtasaka@fedoraproject.org>
shann@25788 3 Date: Fri, 24 Jan 2020 13:33:00 +0900
shann@25788 4 Subject: [PATCH] Support gcc10 compilation
shann@25788 5
shann@25788 6 gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like
shann@25788 7
shann@25788 8 /bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu-cache-gen/menu-tags.h:167: first defined here
shann@25788 9 /bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu-cache-gen/menu-tags.h:164: first defined here
shann@25788 10 /bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.o:menu-cache-gen/menu-tags.h:52: first defined here
shann@25788 11 ....
shann@25788 12
shann@25788 13 This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files.
shann@25788 14 ---
shann@25788 15 menu-cache-gen/menu-tags.h | 55 ++++++++++++--------------------------
shann@25788 16 1 file changed, 17 insertions(+), 38 deletions(-)
shann@25788 17
shann@25788 18 diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
shann@25788 19 index f3fd7d3..f71c0bc 100644
shann@25788 20 --- a/menu-cache-gen/menu-tags.h
shann@25788 21 +++ b/menu-cache-gen/menu-tags.h
shann@25788 22 @@ -22,38 +22,17 @@
shann@25788 23 #include <libfm/fm-extra.h>
shann@25788 24 #include <menu-cache.h>
shann@25788 25
shann@25788 26 -FmXmlFileTag menuTag_Menu;
shann@25788 27 -FmXmlFileTag menuTag_AppDir;
shann@25788 28 -FmXmlFileTag menuTag_DefaultAppDirs;
shann@25788 29 -FmXmlFileTag menuTag_DirectoryDir;
shann@25788 30 -FmXmlFileTag menuTag_DefaultDirectoryDirs;
shann@25788 31 -FmXmlFileTag menuTag_Include;
shann@25788 32 -FmXmlFileTag menuTag_Exclude;
shann@25788 33 -FmXmlFileTag menuTag_Filename;
shann@25788 34 -FmXmlFileTag menuTag_Or;
shann@25788 35 -FmXmlFileTag menuTag_And;
shann@25788 36 -FmXmlFileTag menuTag_Not;
shann@25788 37 -FmXmlFileTag menuTag_Category;
shann@25788 38 -FmXmlFileTag menuTag_MergeFile;
shann@25788 39 -FmXmlFileTag menuTag_MergeDir;
shann@25788 40 -FmXmlFileTag menuTag_DefaultMergeDirs;
shann@25788 41 -FmXmlFileTag menuTag_Directory;
shann@25788 42 -FmXmlFileTag menuTag_Name;
shann@25788 43 -FmXmlFileTag menuTag_Deleted;
shann@25788 44 -FmXmlFileTag menuTag_NotDeleted;
shann@25788 45 -FmXmlFileTag menuTag_OnlyUnallocated;
shann@25788 46 -FmXmlFileTag menuTag_NotOnlyUnallocated;
shann@25788 47 -FmXmlFileTag menuTag_All;
shann@25788 48 -FmXmlFileTag menuTag_LegacyDir;
shann@25788 49 -FmXmlFileTag menuTag_KDELegacyDirs;
shann@25788 50 -FmXmlFileTag menuTag_Move;
shann@25788 51 -FmXmlFileTag menuTag_Old;
shann@25788 52 -FmXmlFileTag menuTag_New;
shann@25788 53 -FmXmlFileTag menuTag_Layout;
shann@25788 54 -FmXmlFileTag menuTag_DefaultLayout;
shann@25788 55 -FmXmlFileTag menuTag_Menuname;
shann@25788 56 -FmXmlFileTag menuTag_Separator;
shann@25788 57 -FmXmlFileTag menuTag_Merge;
shann@25788 58 +extern FmXmlFileTag menuTag_AppDir;
shann@25788 59 +extern FmXmlFileTag menuTag_DirectoryDir;
shann@25788 60 +extern FmXmlFileTag menuTag_Include;
shann@25788 61 +extern FmXmlFileTag menuTag_Exclude;
shann@25788 62 +extern FmXmlFileTag menuTag_Filename;
shann@25788 63 +extern FmXmlFileTag menuTag_Or;
shann@25788 64 +extern FmXmlFileTag menuTag_And;
shann@25788 65 +extern FmXmlFileTag menuTag_Not;
shann@25788 66 +extern FmXmlFileTag menuTag_Category;
shann@25788 67 +extern FmXmlFileTag menuTag_All;
shann@25788 68 +extern FmXmlFileTag menuTag_LegacyDir;
shann@25788 69
shann@25788 70 typedef enum {
shann@25788 71 MERGE_NONE, /* starting value */
shann@25788 72 @@ -152,19 +131,19 @@ typedef struct {
shann@25788 73 } MenuRule;
shann@25788 74
shann@25788 75 /* requested language(s) */
shann@25788 76 -char **languages;
shann@25788 77 +extern char **languages;
shann@25788 78
shann@25788 79 /* list of menu files to monitor */
shann@25788 80 -GSList *MenuFiles;
shann@25788 81 +extern GSList *MenuFiles;
shann@25788 82
shann@25788 83 /* list of menu dirs to monitor */
shann@25788 84 -GSList *MenuDirs;
shann@25788 85 +extern GSList *MenuDirs;
shann@25788 86
shann@25788 87 /* list of available app dirs */
shann@25788 88 -GSList *AppDirs;
shann@25788 89 +extern GSList *AppDirs;
shann@25788 90
shann@25788 91 /* list of available dir dirs */
shann@25788 92 -GSList *DirDirs;
shann@25788 93 +extern GSList *DirDirs;
shann@25788 94
shann@25788 95 /* parse and merge menu files */
shann@25788 96 MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
shann@25788 97 @@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
shann@25788 98 void _free_layout_items(GList *data);
shann@25788 99
shann@25788 100 /* verbosity level */
shann@25788 101 -gint verbose;
shann@25788 102 +extern gint verbose;
shann@25788 103
shann@25788 104 #define DBG if (verbose) g_debug
shann@25788 105 #define VDBG if (verbose > 1) g_debug
shann@25788 106 --
shann@25788 107 2.24.1
shann@25788 108