From 2e57d3a081e2c4a42989334a628de7c1a4f2c249 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 9 Feb 2021 20:27:50 +0000 Subject: [PATCH] libfm: update patches --- x11-packages/libfm-extra/archivers.list.patch | 12 ---------- .../libfm-extra/fix-hardcoded-paths.patch | 23 ++++++++++--------- x11-packages/libfm/archivers.list.patch | 12 ---------- x11-packages/libfm/fix-hardcoded-paths.patch | 23 ++++++++++--------- 4 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 x11-packages/libfm-extra/archivers.list.patch delete mode 100644 x11-packages/libfm/archivers.list.patch diff --git a/x11-packages/libfm-extra/archivers.list.patch b/x11-packages/libfm-extra/archivers.list.patch deleted file mode 100644 index cd0480c1f..000000000 --- a/x11-packages/libfm-extra/archivers.list.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 index 7ffb38b6f..538195d5a 100644 --- a/x11-packages/libfm-extra/fix-hardcoded-paths.patch +++ b/x11-packages/libfm-extra/fix-hardcoded-paths.patch @@ -1,18 +1,19 @@ -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 @@ +diff -uNr libfm-1.3.2/src/base/fm-file-info.c libfm-1.3.2.mod/src/base/fm-file-info.c +--- libfm-1.3.2/src/base/fm-file-info.c 2021-02-02 13:59:25.000000000 +0000 ++++ libfm-1.3.2.mod/src/base/fm-file-info.c 2021-02-09 20:25:02.577394206 +0000 +@@ -1394,8 +1394,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, "/usr/share/") && +- !g_str_has_prefix(fi->target, "/usr/local/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 +diff -uNr libfm-1.3.2/src/gtk/fm-app-chooser-dlg.c libfm-1.3.2.mod/src/gtk/fm-app-chooser-dlg.c +--- libfm-1.3.2/src/gtk/fm-app-chooser-dlg.c 2018-04-16 19:11:33.000000000 +0000 ++++ libfm-1.3.2.mod/src/gtk/fm-app-chooser-dlg.c 2021-02-09 20:24:24.057358675 +0000 @@ -231,7 +231,7 @@ gtk_file_filter_add_custom(filter, GTK_FILE_FILTER_FILENAME|GTK_FILE_FILTER_MIME_TYPE, exec_filter_func, NULL, NULL); @@ -22,9 +23,9 @@ diff -uNr libfm-1.3.1/src/gtk/fm-app-chooser-dlg.c libfm-1.3.1.mod/src/gtk/fm-ap 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 +diff -uNr libfm-1.3.2/src/modules/gtk-fileprop-x-desktop.c libfm-1.3.2.mod/src/modules/gtk-fileprop-x-desktop.c +--- libfm-1.3.2/src/modules/gtk-fileprop-x-desktop.c 2018-04-16 19:11:33.000000000 +0000 ++++ libfm-1.3.2.mod/src/modules/gtk-fileprop-x-desktop.c 2021-02-09 20:24:15.160426586 +0000 @@ -67,7 +67,7 @@ NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, diff --git a/x11-packages/libfm/archivers.list.patch b/x11-packages/libfm/archivers.list.patch deleted file mode 100644 index cd0480c1f..000000000 --- a/x11-packages/libfm/archivers.list.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 index 7ffb38b6f..538195d5a 100644 --- a/x11-packages/libfm/fix-hardcoded-paths.patch +++ b/x11-packages/libfm/fix-hardcoded-paths.patch @@ -1,18 +1,19 @@ -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 @@ +diff -uNr libfm-1.3.2/src/base/fm-file-info.c libfm-1.3.2.mod/src/base/fm-file-info.c +--- libfm-1.3.2/src/base/fm-file-info.c 2021-02-02 13:59:25.000000000 +0000 ++++ libfm-1.3.2.mod/src/base/fm-file-info.c 2021-02-09 20:25:02.577394206 +0000 +@@ -1394,8 +1394,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, "/usr/share/") && +- !g_str_has_prefix(fi->target, "/usr/local/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 +diff -uNr libfm-1.3.2/src/gtk/fm-app-chooser-dlg.c libfm-1.3.2.mod/src/gtk/fm-app-chooser-dlg.c +--- libfm-1.3.2/src/gtk/fm-app-chooser-dlg.c 2018-04-16 19:11:33.000000000 +0000 ++++ libfm-1.3.2.mod/src/gtk/fm-app-chooser-dlg.c 2021-02-09 20:24:24.057358675 +0000 @@ -231,7 +231,7 @@ gtk_file_filter_add_custom(filter, GTK_FILE_FILTER_FILENAME|GTK_FILE_FILTER_MIME_TYPE, exec_filter_func, NULL, NULL); @@ -22,9 +23,9 @@ diff -uNr libfm-1.3.1/src/gtk/fm-app-chooser-dlg.c libfm-1.3.1.mod/src/gtk/fm-ap 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 +diff -uNr libfm-1.3.2/src/modules/gtk-fileprop-x-desktop.c libfm-1.3.2.mod/src/modules/gtk-fileprop-x-desktop.c +--- libfm-1.3.2/src/modules/gtk-fileprop-x-desktop.c 2018-04-16 19:11:33.000000000 +0000 ++++ libfm-1.3.2.mod/src/modules/gtk-fileprop-x-desktop.c 2021-02-09 20:24:15.160426586 +0000 @@ -67,7 +67,7 @@ NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,