Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

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

 shell-term-fm/spacefm/DETAILS                                              | 
   5 
 shell-term-fm/spacefm/HISTORY                                              | 
  10 +
 shell-term-fm/spacefm/PRE_BUILD                                            | 
  10 -
 shell-term-fm/spacefm/patches/0001-Fix-global-definitions-at-headers.patch | 
 100 ++++++++++
 4 files changed, 121 insertions(+), 4 deletions(-)

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

    spacefm: Fix global definitions in headers
    
    Needed by, at least, gnu ld 2.35.

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

    spacefm: fix missing include for major & minor macros on non-glibc systems

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

    spacefm: Fix build against musl

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

    spacefm 1.0.6

diff --git a/shell-term-fm/spacefm/DETAILS b/shell-term-fm/spacefm/DETAILS
index c2b2a57..8b654c0 100755
--- a/shell-term-fm/spacefm/DETAILS
+++ b/shell-term-fm/spacefm/DETAILS
@@ -1,9 +1,8 @@
            SPELL=spacefm
-         VERSION=1.0.5
-      PATCHLEVEL=1
+         VERSION=1.0.6
           SOURCE=$SPELL-$VERSION.tar.gz
    
SOURCE_URL[0]=https://github.com/IgnorantGuru/spacefm/archive/$VERSION.tar.gz
-     
SOURCE_HASH=sha512:f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498
+     
SOURCE_HASH=sha512:37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://ignorantguru.github.com/spacefm/
       LICENSE[0]=GPL
diff --git a/shell-term-fm/spacefm/HISTORY b/shell-term-fm/spacefm/HISTORY
index 81a93f3..b3e80e8 100644
--- a/shell-term-fm/spacefm/HISTORY
+++ b/shell-term-fm/spacefm/HISTORY
@@ -1,3 +1,13 @@
+2020-07-28 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD,
+         patches/0001-Fix-global-definitions-at-src-headers.patch:
+         fixed global definitions
+       * PRE_BUILD: Fixed build against musl
+         fixed missing major & minor macros on non-glibc systems
+
+2020-07-29 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 1.0.6
+
 2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS: Update dependency; s/gettext/GETTEXT/
 
diff --git a/shell-term-fm/spacefm/PRE_BUILD b/shell-term-fm/spacefm/PRE_BUILD
index 074fab2..1f2d5ea 100755
--- a/shell-term-fm/spacefm/PRE_BUILD
+++ b/shell-term-fm/spacefm/PRE_BUILD
@@ -1,7 +1,15 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+apply_patch_dir patches &&
+
 # fix sha*sum paths
 sedit "s:/usr/bin/sha256sum:/bin/sha256sum:" src/vfs/vfs-file-task.c &&
 sedit 
"s:/usr/bin/sha256sum:/bin/sha256sum:;s:/usr/bin/sha512sum:/bin/sha512sum:" 
src/spacefm-auth &&
-sedit 
"s:/usr/bin/sha256sum:/bin/sha256sum:;s:/usr/bin/sha512sum:/bin/sha512sum:" 
src/spacefm-auth.bash
+sedit 
"s:/usr/bin/sha256sum:/bin/sha256sum:;s:/usr/bin/sha512sum:/bin/sha512sum:" 
src/spacefm-auth.bash &&
+
+# fix missing major & minor macros
+sedit '/^#include <locale/a#include <sys/sysmacros.h>' src/main.c &&
+
+# fix for musl libc
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git 
a/shell-term-fm/spacefm/patches/0001-Fix-global-definitions-at-headers.patch 
b/shell-term-fm/spacefm/patches/0001-Fix-global-definitions-at-headers.patch
new file mode 100644
index 0000000..8a5f61d
--- /dev/null
+++ 
b/shell-term-fm/spacefm/patches/0001-Fix-global-definitions-at-headers.patch
@@ -0,0 +1,100 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Tue, 28 Jul 2020 23:20:16 +0000
+Subject: [PATCH] Fix global definitions at headers
+
+Global definitions should be declared explicitly as extern in headers and
+also in some code file.
+
+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/src/settings.h b/src/settings.h
+index e25bdc328031..2355d78d5d56 100644
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -52,6 +52,24 @@
+ /* Dirty hack: check whether we are under LXDE or not */
+ #define is_under_LXDE()     (g_getenv( "_LXSESSION_PID" ) != NULL)
+ 
++GList* xsets;
++XSet* evt_win_focus;
++XSet* evt_win_move;
++XSet* evt_win_click;
++XSet* evt_win_key;
++XSet* evt_win_close;
++XSet* evt_pnl_show;
++XSet* evt_pnl_focus;
++XSet* evt_pnl_sel;
++XSet* evt_tab_new;
++XSet* evt_tab_chdir;
++XSet* evt_tab_focus;
++XSet* evt_tab_close;
++XSet* evt_device;
++GList* xset_cmd_history;
++char* settings_terminal_su;
++char* settings_graphical_su;
++
+ AppSettings app_settings = {0};
+ /* const gboolean singleInstance_default = TRUE; */
+ const gboolean show_hidden_files_default = FALSE;
+--- a/src/settings.h
++++ b/src/settings.h
+@@ -120,7 +120,7 @@
+ 
///////////////////////////////////////////////////////////////////////////////
+ //MOD extra settings below
+ 
+-GList* xsets;
++extern GList* xsets;
+ 
+ enum {
+     XSET_B_UNSET,
+@@ -311,22 +311,22 @@ typedef struct
+ } XMenuItem;
+ 
+ // cache these for speed in event handlers
+-XSet* evt_win_focus;
+-XSet* evt_win_move;
+-XSet* evt_win_click;
+-XSet* evt_win_key;
+-XSet* evt_win_close;
+-XSet* evt_pnl_show;
+-XSet* evt_pnl_focus;
+-XSet* evt_pnl_sel;
+-XSet* evt_tab_new;
+-XSet* evt_tab_chdir;
+-XSet* evt_tab_focus;
+-XSet* evt_tab_close;
+-XSet* evt_device;
++extern XSet* evt_win_focus;
++extern XSet* evt_win_move;
++extern XSet* evt_win_click;
++extern XSet* evt_win_key;
++extern XSet* evt_win_close;
++extern XSet* evt_pnl_show;
++extern XSet* evt_pnl_focus;
++extern XSet* evt_pnl_sel;
++extern XSet* evt_tab_new;
++extern XSet* evt_tab_chdir;
++extern XSet* evt_tab_focus;
++extern XSet* evt_tab_close;
++extern XSet* evt_device;
+ 
+ // instance-wide command history
+-GList* xset_cmd_history;
++extern GList* xset_cmd_history;
+ 
+ static const char* terminal_programs[] =  //for pref-dialog.c
+ {
+@@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and 
contents must match prefdlg.ui
+ };
+ 
+ // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf
+-char* settings_terminal_su;
+-char* settings_graphical_su;
++extern char* settings_terminal_su;
++extern char* settings_graphical_su;
+ 
+ typedef struct
+ {