Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (91ed9340f646d6823295f552dfedfdab17a63db5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (91ed9340f646d6823295f552dfedfdab17a63db5)
  • Date: Tue, 28 Jul 2020 22:38:49 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/libfm-extra/DETAILS |
4
libs/libfm-extra/HISTORY |
3
libs/libfm/DEPENDS |
1
libs/libfm/DETAILS |
4
libs/libfm/HISTORY |
4
lxde/menu-cache/0001-fix-path-to-header.patch |
25 --
lxde/menu-cache/DEPENDS |
1
lxde/menu-cache/DETAILS |
5
lxde/menu-cache/HISTORY |
8
lxde/menu-cache/PRE_BUILD |
3
lxde/menu-cache/patches/0001-Fix-global-definitions-at-menu-tags.h.patch |
120 ++++++++++
lxde/menu-cache/patches/0001-fix-path-to-header.patch |
25 ++
shell-term-fm/pcmanfm/DETAILS |
4
shell-term-fm/pcmanfm/HISTORY |
3
14 files changed, 173 insertions(+), 37 deletions(-)

New commits:
commit 91ed9340f646d6823295f552dfedfdab17a63db5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pcmanfm 1.3.1

commit 839e8619e710afa83f5d487e3330acdd11fd93ee
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libfm 1.3.1

commit cc5135f6070e168f786b43a23dd156d5806eccdd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

menu-cache 1.0.2

commit 644fed4f230c12e6f3d1ca321b4fe7d6f8724d92
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libfm-extra 1.3.1

commit a8e416a4dca834b955abe1e15eec25a6d8453b9d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libfm: depends on libfm-extra

diff --git a/libs/libfm-extra/DETAILS b/libs/libfm-extra/DETAILS
index 8f093f3..3e89e60 100755
--- a/libs/libfm-extra/DETAILS
+++ b/libs/libfm-extra/DETAILS
@@ -1,8 +1,8 @@
SPELL=libfm-extra
- VERSION=1.3.0.2
+ VERSION=1.3.1
SOURCE="libfm-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/lxde/libfm/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:c954c7210b6eee66ec265490e16fe91fe7995cd95b340f49197eec60a9af94f1ca0f67861dd5455c0deb81a10f5091cbf3dc471ed224477acdc081b48d036c69
+
SOURCE_HASH=sha512:82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/libfm-${VERSION}"
DOC_DIRS=""
WEB_SITE=http://wiki.lxde.org/en/PCManFM
diff --git a/libs/libfm-extra/HISTORY b/libs/libfm-extra/HISTORY
index 2110efe..6f5efcc 100644
--- a/libs/libfm-extra/HISTORY
+++ b/libs/libfm-extra/HISTORY
@@ -1,3 +1,6 @@
+2020-07-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.1
+
2019-12-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: fixed SPELL and other variables for indexing

diff --git a/libs/libfm/DEPENDS b/libs/libfm/DEPENDS
index 7da642a..3abfe7f 100755
--- a/libs/libfm/DEPENDS
+++ b/libs/libfm/DEPENDS
@@ -1,3 +1,4 @@
+depends libfm-extra &&
depends atk &&
depends cairo &&
depends dbus &&
diff --git a/libs/libfm/DETAILS b/libs/libfm/DETAILS
index 39a69da..4bdeda6 100755
--- a/libs/libfm/DETAILS
+++ b/libs/libfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=libfm
- VERSION=1.3.0.2
+ VERSION=1.3.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/lxde/libfm/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:c954c7210b6eee66ec265490e16fe91fe7995cd95b340f49197eec60a9af94f1ca0f67861dd5455c0deb81a10f5091cbf3dc471ed224477acdc081b48d036c69
+
SOURCE_HASH=sha512:82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
WEB_SITE=http://wiki.lxde.org/en/PCManFM
diff --git a/libs/libfm/HISTORY b/libs/libfm/HISTORY
index d7be649..ca044d6 100644
--- a/libs/libfm/HISTORY
+++ b/libs/libfm/HISTORY
@@ -1,3 +1,7 @@
+2020-07-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: added dependency on libfm-extra
+ * DETAILS: updated spell to 1.3.1
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/lxde/menu-cache/0001-fix-path-to-header.patch
b/lxde/menu-cache/0001-fix-path-to-header.patch
deleted file mode 100644
index 42906cf..0000000
--- a/lxde/menu-cache/0001-fix-path-to-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6e58c2c34383ac24ab4ff2f0aa6c70f18091a359 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Sat, 10 Sep 2016 13:03:44 +0200
-Subject: [PATCH] fix path to header
-
----
- menu-cache-gen/menu-tags.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
-index f3fd7d3..e9ee422 100644
---- a/menu-cache-gen/menu-tags.h
-+++ b/menu-cache-gen/menu-tags.h
-@@ -19,7 +19,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
- */
-
--#include <libfm/fm-extra.h>
-+#include <libfm-1.0/fm-extra.h>
- #include <menu-cache.h>
-
- FmXmlFileTag menuTag_Menu;
---
-2.10.0
-
diff --git a/lxde/menu-cache/DEPENDS b/lxde/menu-cache/DEPENDS
index c84b480..edffa0e 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 3c0215e..8d5df43 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 b289a0b..37194b3 100644
--- a/lxde/menu-cache/HISTORY
+++ b/lxde/menu-cache/HISTORY
@@ -1,3 +1,11 @@
+2020-07-29 Ismael Luceno <ismael AT 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 AT sourcemage.org>
* DEPENDS: Added dependency on libfm, PATCHLEVEL++

diff --git a/lxde/menu-cache/PRE_BUILD b/lxde/menu-cache/PRE_BUILD
index 321a477..559fe24 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 0000000..94e38a0
--- /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 AT 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/patches/0001-fix-path-to-header.patch
b/lxde/menu-cache/patches/0001-fix-path-to-header.patch
new file mode 100644
index 0000000..42906cf
--- /dev/null
+++ b/lxde/menu-cache/patches/0001-fix-path-to-header.patch
@@ -0,0 +1,25 @@
+From 6e58c2c34383ac24ab4ff2f0aa6c70f18091a359 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sat, 10 Sep 2016 13:03:44 +0200
+Subject: [PATCH] fix path to header
+
+---
+ menu-cache-gen/menu-tags.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
+index f3fd7d3..e9ee422 100644
+--- a/menu-cache-gen/menu-tags.h
++++ b/menu-cache-gen/menu-tags.h
+@@ -19,7 +19,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
+ */
+
+-#include <libfm/fm-extra.h>
++#include <libfm-1.0/fm-extra.h>
+ #include <menu-cache.h>
+
+ FmXmlFileTag menuTag_Menu;
+--
+2.10.0
+
diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index 5204648..f1b89b0 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=pcmanfm
- VERSION=1.2.5
+ VERSION=1.3.1
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/${SOURCE}
-
SOURCE_HASH=sha512:ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3
+
SOURCE_HASH=sha512:68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
diff --git a/shell-term-fm/pcmanfm/HISTORY b/shell-term-fm/pcmanfm/HISTORY
index c8f0b6f..ce2e69b 100644
--- a/shell-term-fm/pcmanfm/HISTORY
+++ b/shell-term-fm/pcmanfm/HISTORY
@@ -1,3 +1,6 @@
+2020-07-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.1
+
2018-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.5




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (91ed9340f646d6823295f552dfedfdab17a63db5), Ismael Luceno, 07/28/2020

Archive powered by MHonArc 2.6.24.

Top of Page