From 1cf98cb164b51de8ad3c20c5d0dd2bc0c9acc41d Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Thu, 7 Feb 2019 02:04:51 +0200 Subject: [PATCH] libfm: add necessary patches --- x11-packages/libfm-extra/archivers.list.patch | 12 +++++++ .../libfm-extra/fix-hardcoded-paths.patch | 36 +++++++++++++++++++ x11-packages/libfm-extra/terminals.list.patch | 11 ++++++ x11-packages/libfm/archivers.list.patch | 12 +++++++ x11-packages/libfm/fix-hardcoded-paths.patch | 36 +++++++++++++++++++ x11-packages/libfm/terminals.list.patch | 11 ++++++ 6 files changed, 118 insertions(+) create mode 100644 x11-packages/libfm-extra/archivers.list.patch create mode 100644 x11-packages/libfm-extra/fix-hardcoded-paths.patch create mode 100644 x11-packages/libfm-extra/terminals.list.patch create mode 100644 x11-packages/libfm/archivers.list.patch create mode 100644 x11-packages/libfm/fix-hardcoded-paths.patch create mode 100644 x11-packages/libfm/terminals.list.patch diff --git a/x11-packages/libfm-extra/archivers.list.patch b/x11-packages/libfm-extra/archivers.list.patch new file mode 100644 index 000000000..cd0480c1f --- /dev/null +++ b/x11-packages/libfm-extra/archivers.list.patch @@ -0,0 +1,12 @@ +diff -uNr libfm-1.3.1/data/archivers.list libfm-1.3.1.mod/data/archivers.list +--- libfm-1.3.1/data/archivers.list 2018-12-17 00:39:56.000000000 +0200 ++++ libfm-1.3.1.mod/data/archivers.list 2019-02-07 02:01:06.052955233 +0200 +@@ -6,7 +6,7 @@ + supports_uris=true + + [xarchiver] +-create=xarchiver --add-to %F ++create=xarchiver --compress %F + extract=xarchiver --extract %F + extract_to=xarchiver --extract-to %d %F + mime_types=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;image/x-compressed-xcf;application/gzip;application/x-gzip;application/x-rar;application/x-rar-compressed;application/vnd.rar;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma-compressed-tar;application/x-lzma;application/x-deb;application/deb;application/vnd.debian.binary-package;application/x-xz;application/x-xz-compressed-tar;application/x-rpm;application/x-source-rpm;application/x-lzop;application/x-lzop-compressed-tar;application/x-tzo;application/x-war;application/x-compress;application/x-tarz;application/x-java-archive;application/x-lha;application/x-lhz; diff --git a/x11-packages/libfm-extra/fix-hardcoded-paths.patch b/x11-packages/libfm-extra/fix-hardcoded-paths.patch new file mode 100644 index 000000000..7ffb38b6f --- /dev/null +++ b/x11-packages/libfm-extra/fix-hardcoded-paths.patch @@ -0,0 +1,36 @@ +diff -uNr libfm-1.3.1/src/base/fm-file-info.c libfm-1.3.1.mod/src/base/fm-file-info.c +--- libfm-1.3.1/src/base/fm-file-info.c 2018-04-26 22:40:12.000000000 +0300 ++++ libfm-1.3.1.mod/src/base/fm-file-info.c 2019-02-07 01:54:20.104240640 +0200 +@@ -1393,7 +1393,7 @@ + which may be considered as a safe desktop entry path + then check if that is a shortcut to a native file + otherwise it is a link to a file under menu:// */ +- if (!g_str_has_prefix(fi->target, "/usr/share/")) ++ if (!g_str_has_prefix(fi->target, "@TERMUX_PREFIX@/share/")) + { + FmPath *target = fm_path_new_for_str(fi->target); + gboolean is_native = fm_path_is_native(target); +diff -uNr libfm-1.3.1/src/gtk/fm-app-chooser-dlg.c libfm-1.3.1.mod/src/gtk/fm-app-chooser-dlg.c +--- libfm-1.3.1/src/gtk/fm-app-chooser-dlg.c 2018-04-16 22:11:33.000000000 +0300 ++++ libfm-1.3.1.mod/src/gtk/fm-app-chooser-dlg.c 2019-02-07 01:55:08.441177018 +0200 +@@ -231,7 +231,7 @@ + gtk_file_filter_add_custom(filter, + GTK_FILE_FILTER_FILENAME|GTK_FILE_FILTER_MIME_TYPE, exec_filter_func, NULL, NULL); + /* gtk_file_filter_set_name(filter, _("Executable files")); */ +- file = fm_select_file(GTK_WINDOW(data->dlg), NULL, "/usr/bin", TRUE, FALSE, filter, NULL); ++ file = fm_select_file(GTK_WINDOW(data->dlg), NULL, "@TERMUX_PREFIX@/bin", TRUE, FALSE, filter, NULL); + + if (file == NULL) + return; +diff -uNr libfm-1.3.1/src/modules/gtk-fileprop-x-desktop.c libfm-1.3.1.mod/src/modules/gtk-fileprop-x-desktop.c +--- libfm-1.3.1/src/modules/gtk-fileprop-x-desktop.c 2018-04-16 22:11:33.000000000 +0300 ++++ libfm-1.3.1.mod/src/modules/gtk-fileprop-x-desktop.c 2019-02-07 01:54:43.961041507 +0200 +@@ -67,7 +67,7 @@ + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); +- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), "/usr/bin"); ++ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), "@TERMUX_PREFIX@/bin"); + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("Executable files") ); + gtk_file_filter_add_custom(GTK_FILE_FILTER(filter), GTK_FILE_FILTER_FILENAME, diff --git a/x11-packages/libfm-extra/terminals.list.patch b/x11-packages/libfm-extra/terminals.list.patch new file mode 100644 index 000000000..2461e9188 --- /dev/null +++ b/x11-packages/libfm-extra/terminals.list.patch @@ -0,0 +1,11 @@ +diff -uNr libfm-1.3.1/data/terminals.list libfm-1.3.1.mod/data/terminals.list +--- libfm-1.3.1/data/terminals.list 2018-04-16 22:11:33.000000000 +0300 ++++ libfm-1.3.1.mod/data/terminals.list 2019-02-07 01:59:43.545905681 +0200 +@@ -1,3 +1,7 @@ ++[aterm] ++open_arg=-e ++desktop_id=aterm.desktop ++ + [xterm] + open_arg=-e + noclose_arg=-hold -e diff --git a/x11-packages/libfm/archivers.list.patch b/x11-packages/libfm/archivers.list.patch new file mode 100644 index 000000000..cd0480c1f --- /dev/null +++ b/x11-packages/libfm/archivers.list.patch @@ -0,0 +1,12 @@ +diff -uNr libfm-1.3.1/data/archivers.list libfm-1.3.1.mod/data/archivers.list +--- libfm-1.3.1/data/archivers.list 2018-12-17 00:39:56.000000000 +0200 ++++ libfm-1.3.1.mod/data/archivers.list 2019-02-07 02:01:06.052955233 +0200 +@@ -6,7 +6,7 @@ + supports_uris=true + + [xarchiver] +-create=xarchiver --add-to %F ++create=xarchiver --compress %F + extract=xarchiver --extract %F + extract_to=xarchiver --extract-to %d %F + mime_types=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;image/x-compressed-xcf;application/gzip;application/x-gzip;application/x-rar;application/x-rar-compressed;application/vnd.rar;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma-compressed-tar;application/x-lzma;application/x-deb;application/deb;application/vnd.debian.binary-package;application/x-xz;application/x-xz-compressed-tar;application/x-rpm;application/x-source-rpm;application/x-lzop;application/x-lzop-compressed-tar;application/x-tzo;application/x-war;application/x-compress;application/x-tarz;application/x-java-archive;application/x-lha;application/x-lhz; diff --git a/x11-packages/libfm/fix-hardcoded-paths.patch b/x11-packages/libfm/fix-hardcoded-paths.patch new file mode 100644 index 000000000..7ffb38b6f --- /dev/null +++ b/x11-packages/libfm/fix-hardcoded-paths.patch @@ -0,0 +1,36 @@ +diff -uNr libfm-1.3.1/src/base/fm-file-info.c libfm-1.3.1.mod/src/base/fm-file-info.c +--- libfm-1.3.1/src/base/fm-file-info.c 2018-04-26 22:40:12.000000000 +0300 ++++ libfm-1.3.1.mod/src/base/fm-file-info.c 2019-02-07 01:54:20.104240640 +0200 +@@ -1393,7 +1393,7 @@ + which may be considered as a safe desktop entry path + then check if that is a shortcut to a native file + otherwise it is a link to a file under menu:// */ +- if (!g_str_has_prefix(fi->target, "/usr/share/")) ++ if (!g_str_has_prefix(fi->target, "@TERMUX_PREFIX@/share/")) + { + FmPath *target = fm_path_new_for_str(fi->target); + gboolean is_native = fm_path_is_native(target); +diff -uNr libfm-1.3.1/src/gtk/fm-app-chooser-dlg.c libfm-1.3.1.mod/src/gtk/fm-app-chooser-dlg.c +--- libfm-1.3.1/src/gtk/fm-app-chooser-dlg.c 2018-04-16 22:11:33.000000000 +0300 ++++ libfm-1.3.1.mod/src/gtk/fm-app-chooser-dlg.c 2019-02-07 01:55:08.441177018 +0200 +@@ -231,7 +231,7 @@ + gtk_file_filter_add_custom(filter, + GTK_FILE_FILTER_FILENAME|GTK_FILE_FILTER_MIME_TYPE, exec_filter_func, NULL, NULL); + /* gtk_file_filter_set_name(filter, _("Executable files")); */ +- file = fm_select_file(GTK_WINDOW(data->dlg), NULL, "/usr/bin", TRUE, FALSE, filter, NULL); ++ file = fm_select_file(GTK_WINDOW(data->dlg), NULL, "@TERMUX_PREFIX@/bin", TRUE, FALSE, filter, NULL); + + if (file == NULL) + return; +diff -uNr libfm-1.3.1/src/modules/gtk-fileprop-x-desktop.c libfm-1.3.1.mod/src/modules/gtk-fileprop-x-desktop.c +--- libfm-1.3.1/src/modules/gtk-fileprop-x-desktop.c 2018-04-16 22:11:33.000000000 +0300 ++++ libfm-1.3.1.mod/src/modules/gtk-fileprop-x-desktop.c 2019-02-07 01:54:43.961041507 +0200 +@@ -67,7 +67,7 @@ + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); +- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), "/usr/bin"); ++ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), "@TERMUX_PREFIX@/bin"); + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("Executable files") ); + gtk_file_filter_add_custom(GTK_FILE_FILTER(filter), GTK_FILE_FILTER_FILENAME, diff --git a/x11-packages/libfm/terminals.list.patch b/x11-packages/libfm/terminals.list.patch new file mode 100644 index 000000000..2461e9188 --- /dev/null +++ b/x11-packages/libfm/terminals.list.patch @@ -0,0 +1,11 @@ +diff -uNr libfm-1.3.1/data/terminals.list libfm-1.3.1.mod/data/terminals.list +--- libfm-1.3.1/data/terminals.list 2018-04-16 22:11:33.000000000 +0300 ++++ libfm-1.3.1.mod/data/terminals.list 2019-02-07 01:59:43.545905681 +0200 +@@ -1,3 +1,7 @@ ++[aterm] ++open_arg=-e ++desktop_id=aterm.desktop ++ + [xterm] + open_arg=-e + noclose_arg=-hold -e