summaryrefslogtreecommitdiffstats
path: root/lxde
diff options
context:
space:
mode:
authorIsmael Luceno2020-07-29 00:37:55 +0200
committerIsmael Luceno2020-07-29 00:39:11 +0200
commitcc5135f6070e168f786b43a23dd156d5806eccdd (patch)
treed54a91135954a306dedcc3886d0aba26ce7c177a /lxde
parent644fed4f230c12e6f3d1ca321b4fe7d6f8724d92 (diff)
menu-cache 1.0.2
Diffstat (limited to 'lxde')
-rwxr-xr-xlxde/menu-cache/DEPENDS1
-rwxr-xr-xlxde/menu-cache/DETAILS5
-rw-r--r--lxde/menu-cache/HISTORY8
-rwxr-xr-xlxde/menu-cache/PRE_BUILD3
-rw-r--r--lxde/menu-cache/patches/0001-Fix-global-definitions-at-menu-tags.h.patch120
-rw-r--r--lxde/menu-cache/patches/0001-fix-path-to-header.patch (renamed from lxde/menu-cache/0001-fix-path-to-header.patch)0
6 files changed, 131 insertions, 6 deletions
diff --git a/lxde/menu-cache/DEPENDS b/lxde/menu-cache/DEPENDS
index c84b48071e..edffa0e35e 100755
--- a/lxde/menu-cache/DEPENDS
+++ b/lxde/menu-cache/DEPENDS
@@ -1,2 +1 @@
-depends libfm &&
depends gtk+2
diff --git a/lxde/menu-cache/DETAILS b/lxde/menu-cache/DETAILS
index 3c0215e210..8d5df436e7 100755
--- a/lxde/menu-cache/DETAILS
+++ b/lxde/menu-cache/DETAILS
@@ -1,9 +1,8 @@
SPELL=menu-cache
- VERSION=1.0.1
- PATCHLEVEL=1
+ VERSION=1.0.2
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=http://downloads.sourceforge.net/project/lxde/${SPELL}/$(echo $VERSION | cut -f1,2 -d.)/${SOURCE}
- SOURCE_HASH=sha512:5de4bf99ab5a511da6781d54b03349cc0232b379a73f9f9c328fb9aed6ec03558a9adda85be1fbbe53d94669d07a5196929ab67cd3291de7aae59f587afda3a3
+ SOURCE_HASH=sha512:4a74d464778160052ca7c2abda8c899ce4a3bdf8ddf5fe9ca4cd7297a62340ad1b065162fc5ecb55c0af206175e50dacd4ad0c01a8ffac5690012e534dc3b4b7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/menu-cache/HISTORY b/lxde/menu-cache/HISTORY
index b289a0b803..37194b3909 100644
--- a/lxde/menu-cache/HISTORY
+++ b/lxde/menu-cache/HISTORY
@@ -1,3 +1,11 @@
+2020-07-29 Ismael Luceno <ismael@sourcemage.org>
+ * PRE_BUILD: use apply_patch_dir
+ * patches/0001-fix-path-to-header.patch: moved to the patches directory
+ * patches/0001-Fix-global-definitions-at-menu-tags.h.patch:
+ fixed build with ld 2.35
+ * DEPENDS: removed circular dependency with libfm
+ * DETAILS: updated spell to 1.0.2
+
2017-01-12 Ismael Luceno <ismael@sourcemage.org>
* DEPENDS: Added dependency on libfm, PATCHLEVEL++
diff --git a/lxde/menu-cache/PRE_BUILD b/lxde/menu-cache/PRE_BUILD
index 321a4773c6..559fe24132 100755
--- a/lxde/menu-cache/PRE_BUILD
+++ b/lxde/menu-cache/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-fix-path-to-header.patch"
+apply_patch_dir patches
diff --git a/lxde/menu-cache/patches/0001-Fix-global-definitions-at-menu-tags.h.patch b/lxde/menu-cache/patches/0001-Fix-global-definitions-at-menu-tags.h.patch
new file mode 100644
index 0000000000..94e38a0276
--- /dev/null
+++ b/lxde/menu-cache/patches/0001-Fix-global-definitions-at-menu-tags.h.patch
@@ -0,0 +1,120 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+Date: Tue, 28 Jul 2020 22:22:23 +0000
+Subject: [PATCH] Fix global definitions at menu-tags.h
+
+Global definitions should be declared explicitly as extern.
+
+Recent versions of ld (at least 2.35) complain and fail instead of merging them
+automatically unless explicitly told to do so with the
+--allow-multiple-definition flag.
+
+diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
+index e9ee4223813e..2530bb2c2329 100644
+--- a/menu-cache-gen/menu-tags.h
++++ b/menu-cache-gen/menu-tags.h
+@@ -22,38 +22,38 @@
+ #include <libfm-1.0/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_Menu;
++extern FmXmlFileTag menuTag_AppDir;
++extern FmXmlFileTag menuTag_DefaultAppDirs;
++extern FmXmlFileTag menuTag_DirectoryDir;
++extern FmXmlFileTag menuTag_DefaultDirectoryDirs;
++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_MergeFile;
++extern FmXmlFileTag menuTag_MergeDir;
++extern FmXmlFileTag menuTag_DefaultMergeDirs;
++extern FmXmlFileTag menuTag_Directory;
++extern FmXmlFileTag menuTag_Name;
++extern FmXmlFileTag menuTag_Deleted;
++extern FmXmlFileTag menuTag_NotDeleted;
++extern FmXmlFileTag menuTag_OnlyUnallocated;
++extern FmXmlFileTag menuTag_NotOnlyUnallocated;
++extern FmXmlFileTag menuTag_All;
++extern FmXmlFileTag menuTag_LegacyDir;
++extern FmXmlFileTag menuTag_KDELegacyDirs;
++extern FmXmlFileTag menuTag_Move;
++extern FmXmlFileTag menuTag_Old;
++extern FmXmlFileTag menuTag_New;
++extern FmXmlFileTag menuTag_Layout;
++extern FmXmlFileTag menuTag_DefaultLayout;
++extern FmXmlFileTag menuTag_Menuname;
++extern FmXmlFileTag menuTag_Separator;
++extern FmXmlFileTag menuTag_Merge;
+
+ typedef enum {
+ MERGE_NONE, /* starting value */
+@@ -152,19 +152,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 +177,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
diff --git a/lxde/menu-cache/0001-fix-path-to-header.patch b/lxde/menu-cache/patches/0001-fix-path-to-header.patch
index 42906cf3a6..42906cf3a6 100644
--- a/lxde/menu-cache/0001-fix-path-to-header.patch
+++ b/lxde/menu-cache/patches/0001-fix-path-to-header.patch