From def5ed843cdd55940cb7f47bacb1e0d416396c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayhan=20Yal=C3=A7=C4=B1nsoy?= Date: Tue, 27 Apr 2021 13:49:42 +0300 Subject: [PATCH 1/2] menu-cache:fixed build for gcc10 --- desktop/lxqt/menu-cache/actions.py | 4 +- ...1.1.0-0001-Support-gcc10-compilation.patch | 108 ++++++++++++++++++ desktop/lxqt/menu-cache/pspec.xml | 12 +- 3 files changed, 122 insertions(+), 2 deletions(-) create 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 9797b218d4..bb3636f570 100644 --- a/desktop/lxqt/menu-cache/actions.py +++ b/desktop/lxqt/menu-cache/actions.py @@ -11,7 +11,9 @@ from pisi.actionsapi import autotools def setup(): shelltools.system("./autogen.sh") - autotools.configure("--disable-static") + autotools.configure("--disable-static \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc") def build(): autotools.make() 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 new file mode 100644 index 0000000000..29f8e53444 --- /dev/null +++ b/desktop/lxqt/menu-cache/files/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch @@ -0,0 +1,108 @@ +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 53c0393c6a..89156b2e68 100644 --- a/desktop/lxqt/menu-cache/pspec.xml +++ b/desktop/lxqt/menu-cache/pspec.xml @@ -18,8 +18,11 @@ gtk-doc glib2-devel libfm-extra-devel - qt5-base-devel + qt5-base-devel + + menu-cache-1.1.0-0001-Support-gcc10-compilation.patch + menu-cache @@ -47,6 +50,13 @@ + + 2021-04-26 + 1.1.0 + fixed build for gcc10 + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2020-11-05 1.1.0 From 52ff2a20d545a64236bc23e5a34871976e4a286d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayhan=20Yal=C3=A7=C4=B1nsoy?= Date: Tue, 27 Apr 2021 13:51:09 +0300 Subject: [PATCH 2/2] featherpad:v.bump to 0.18.0 --- desktop/lxqt/featherpad/actions.py | 4 +--- desktop/lxqt/featherpad/pspec.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/desktop/lxqt/featherpad/actions.py b/desktop/lxqt/featherpad/actions.py index c80fdc056b..5d986a9eef 100644 --- a/desktop/lxqt/featherpad/actions.py +++ b/desktop/lxqt/featherpad/actions.py @@ -12,9 +12,7 @@ def setup(): shelltools.makedirs("build") shelltools.cd("build") cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DPULL_TRANSLATIONS=yes", sourceDir="..") + -DCMAKE_BUILD_TYPE=Release", sourceDir="..") def build(): shelltools.cd("build") cmaketools.make() diff --git a/desktop/lxqt/featherpad/pspec.xml b/desktop/lxqt/featherpad/pspec.xml index f9dc03cbff..74776ea8cf 100644 --- a/desktop/lxqt/featherpad/pspec.xml +++ b/desktop/lxqt/featherpad/pspec.xml @@ -13,7 +13,7 @@ app:gui FeatherPad is a lightweight Qt5 plain-text editor for Linux FeatherPad is a lightweight Qt5 plain-text editor for Linux - https://github.com/tsujan/FeatherPad/archive/V0.16.0.tar.gz + https://github.com/tsujan/FeatherPad/archive/V0.18.0.tar.gz extra-cmake-modules qt5-base-devel @@ -47,6 +47,13 @@ + + 2021-04-26 + 0.18.0 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2020-11-05 0.16.0