From d8a4ca3aa1d0db237f0a837f2cb5e19d2ab721a6 Mon Sep 17 00:00:00 2001 From: uglyside Date: Thu, 3 Jul 2025 06:53:32 +0300 Subject: [PATCH] menu-cache. --- desktop/lxqt/menu-cache/actions.py | 11 +- ...1.1.0-0001-Support-gcc10-compilation.patch | 108 ------------------ desktop/lxqt/menu-cache/pspec.xml | 16 +-- 3 files changed, 14 insertions(+), 121 deletions(-) delete mode 100644 desktop/lxqt/menu-cache/files/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch diff --git a/desktop/lxqt/menu-cache/actions.py b/desktop/lxqt/menu-cache/actions.py index bb3636f570..30756a563b 100644 --- a/desktop/lxqt/menu-cache/actions.py +++ b/desktop/lxqt/menu-cache/actions.py @@ -1,16 +1,14 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +# # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/copyleft/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt - -from pisi.actionsapi import shelltools -from pisi.actionsapi import get -from pisi.actionsapi import pisitools from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get def setup(): - shelltools.system("./autogen.sh") autotools.configure("--disable-static \ --libexecdir=/usr/lib \ --sysconfdir=/etc") @@ -20,4 +18,5 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.dodoc("AUTHORS", "COPYING") diff --git a/desktop/lxqt/menu-cache/files/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch b/desktop/lxqt/menu-cache/files/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch deleted file mode 100644 index 29f8e53444..0000000000 --- a/desktop/lxqt/menu-cache/files/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 24 Jan 2020 13:33:00 +0900 -Subject: [PATCH] Support gcc10 compilation - -gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like - -/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 -/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 -/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 -.... - -This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files. ---- - menu-cache-gen/menu-tags.h | 55 ++++++++++++-------------------------- - 1 file changed, 17 insertions(+), 38 deletions(-) - -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 - #include - --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 --- -2.24.1 - diff --git a/desktop/lxqt/menu-cache/pspec.xml b/desktop/lxqt/menu-cache/pspec.xml index 997e6ef3b3..03e9d02b91 100644 --- a/desktop/lxqt/menu-cache/pspec.xml +++ b/desktop/lxqt/menu-cache/pspec.xml @@ -1,19 +1,19 @@ - + menu-cache - https://www.lxde.org/ + https://github.com/lxde/menu-cache Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org - GPL2 + LGPLv2.1 app lxqt freedesktop.org desktop menus for LXDE Library used to read freedesktop.org menus - https://github.com/lxde/menu-cache/archive/1.1.1.tar.gz + https://github.com/lxde/releases/raw/master/releases/menu-cache-1.1.1.tar.xz gtk-doc glib2-devel @@ -21,12 +21,12 @@ qt6-base-devel - + + menu-cache - Development headers for libfm-qt glib2 libfm-extra @@ -37,6 +37,7 @@ /usr/share + menu-cache-devel Development files for menu-cache @@ -46,9 +47,10 @@ /usr/include - /usr/lib/pkgconfig + /usr/lib/pkgconfig + 2025-05-15