mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-25 10:03:03 +01:00
system/spacefm: Patch for glibc >= 2.28 and gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
07a7a7a3ef
commit
52428c230a
3 changed files with 109 additions and 0 deletions
92
system/spacefm/gcc10.patch
Normal file
92
system/spacefm/gcc10.patch
Normal file
|
@ -0,0 +1,92 @@
|
||||||
|
https://github.com/IgnorantGuru/spacefm/issues/770
|
||||||
|
|
||||||
|
diff --git a/src/settings.c b/src/settings.c
|
||||||
|
index 280196f..9d8e880 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)
|
||||||
|
|
||||||
|
+/* GCC 10.1+ */
|
||||||
|
+char* settings_terminal_su = NULL;
|
||||||
|
+char* settings_graphical_su = NULL;
|
||||||
|
+GList* xset_cmd_history = NULL;
|
||||||
|
+XSet* evt_win_focus = NULL;
|
||||||
|
+XSet* evt_win_move = NULL;
|
||||||
|
+XSet* evt_win_click = NULL;
|
||||||
|
+XSet* evt_win_key = NULL;
|
||||||
|
+XSet* evt_win_close = NULL;
|
||||||
|
+XSet* evt_pnl_show = NULL;
|
||||||
|
+XSet* evt_pnl_focus = NULL;
|
||||||
|
+XSet* evt_pnl_sel = NULL;
|
||||||
|
+XSet* evt_tab_new = NULL;
|
||||||
|
+XSet* evt_tab_chdir = NULL;
|
||||||
|
+XSet* evt_tab_focus = NULL;
|
||||||
|
+XSet* evt_tab_close = NULL;
|
||||||
|
+XSet* evt_device = NULL;
|
||||||
|
+
|
||||||
|
AppSettings app_settings = {0};
|
||||||
|
/* const gboolean singleInstance_default = TRUE; */
|
||||||
|
const gboolean show_hidden_files_default = FALSE;
|
||||||
|
diff --git a/src/settings.h b/src/settings.h
|
||||||
|
index 07419b8..4591d48 100644
|
||||||
|
--- a/src/settings.h
|
||||||
|
+++ b/src/settings.h
|
||||||
|
@@ -130,7 +130,7 @@ const char* xset_get_user_tmp_dir();
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
//MOD extra settings below
|
||||||
|
|
||||||
|
-GList* xsets;
|
||||||
|
+extern GList* xsets;
|
||||||
|
|
||||||
|
enum {
|
||||||
|
XSET_B_UNSET,
|
||||||
|
@@ -333,22 +333,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
|
||||||
|
{
|
||||||
|
@@ -396,8 +396,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
|
||||||
|
{
|
12
system/spacefm/glibc-2.28.patch
Normal file
12
system/spacefm/glibc-2.28.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/src/main.c b/src/main.c
|
||||||
|
index 645e2ec..9453a3b 100644
|
||||||
|
--- a/src/main.c
|
||||||
|
+++ b/src/main.c
|
||||||
|
@@ -23,6 +23,7 @@
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
|
||||||
|
#include <signal.h>
|
||||||
|
|
|
@ -81,6 +81,11 @@ find -L . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||||
|
|
||||||
|
# https://github.com/IgnorantGuru/spacefm/issues/727
|
||||||
|
patch -p1 < $CWD/glibc-2.28.patch
|
||||||
|
# https://github.com/IgnorantGuru/spacefm/issues/770
|
||||||
|
patch -p1 < $CWD/gcc10.patch
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
|
|
Loading…
Reference in a new issue