diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2018-10-06 22:16:16 +0300 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2018-10-06 23:21:08 +0300 |
| commit | a3d074d37b2c6c9adfabf931742e1fb4ab65e2f9 (patch) | |
| tree | f15e0cf5d2d4c0d8c0a9f31fffd4f7808fa24b2c /app-arch/engrampa/files | |
| parent | app-editors/emacs-26.1-r3: ppc64 stable, bug 667042 (diff) | |
| download | gentoo-a3d074d37b2c6c9adfabf931742e1fb4ab65e2f9.tar.gz gentoo-a3d074d37b2c6c9adfabf931742e1fb4ab65e2f9.tar.bz2 gentoo-a3d074d37b2c6c9adfabf931742e1fb4ab65e2f9.zip | |
app-arch/engrampa: remove old
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Diffstat (limited to 'app-arch/engrampa/files')
| -rw-r--r-- | app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch | 25 | ||||
| -rw-r--r-- | app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch | 30 |
2 files changed, 0 insertions, 55 deletions
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch deleted file mode 100644 index d0937a8959c5..000000000000 --- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001 -From: monsta <monsta@inbox.ru> -Date: Thu, 24 Dec 2015 17:11:19 +0300 -Subject: [PATCH] 7z: correct checking for p7zip 15.09+ - -from https://github.com/GNOME/file-roller/commit/ed9c3fd2 - -fixes https://github.com/mate-desktop/engrampa/issues/114 ---- - src/fr-command-7z.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c -index 297ba1b..0b784f7 100644 ---- a/src/fr-command-7z.c -+++ b/src/fr-command-7z.c -@@ -106,7 +106,7 @@ list__process_line (char *line, - strncpy (version, ver_start, ver_len); - version[ver_len] = 0; - -- if (strcmp (version, "4.55") < 0) -+ if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.')) - p7z_comm->old_style = TRUE; - else - p7z_comm->old_style = FALSE; diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch deleted file mode 100644 index 4e25898949f0..000000000000 --- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001 -From: sc0w <scow@riseup.net> -Date: Wed, 25 May 2016 02:29:21 +0200 -Subject: [PATCH] p7zip-rar 15.14 supported - -since 15.14, p7zip-rar uses the plugin Rar.so to handle archives - -It can find on /usr/lib/ or /usr/libexec/ - -If someone has it in another folder, we can add it - -Fixes #136 ---- - src/fr-command-7z.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c -index 20cfa2c..a7d032e 100644 ---- a/src/fr-command-7z.c -+++ b/src/fr-command-7z.c -@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand *comm, - if (is_mime_type (mime_type, "application/x-rar") - || is_mime_type (mime_type, "application/x-cbr")) - { -- if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS)) -+ if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS) -+ || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)) - capabilities |= FR_COMMAND_CAN_READ; - } - else |