| 1 |
commit: c7777a81a7fe3dddf312caad6e97451b81fcc71a |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 04:25:39 2016 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 04:25:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=c7777a81 |
| 7 |
|
| 8 |
app-arch/engrampa: Update p7zip support |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
...mpa-1.10.2.ebuild => engrampa-1.10.2-r1.ebuild} | 5 ++++ |
| 13 |
...mpa-1.12.0.ebuild => engrampa-1.12.0-r1.ebuild} | 5 ++++ |
| 14 |
.../files/engrampa-1.10.2-p7zip-15.09-compat.patch | 25 ++++++++++++++++++ |
| 15 |
.../files/engrampa-1.10.2-p7zip-15.14-compat.patch | 30 ++++++++++++++++++++++ |
| 16 |
4 files changed, 65 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-arch/engrampa/engrampa-1.10.2.ebuild b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild |
| 19 |
similarity index 94% |
| 20 |
rename from app-arch/engrampa/engrampa-1.10.2.ebuild |
| 21 |
rename to app-arch/engrampa/engrampa-1.10.2-r1.ebuild |
| 22 |
index f0fc91b..8a613bc 100644 |
| 23 |
--- a/app-arch/engrampa/engrampa-1.10.2.ebuild |
| 24 |
+++ b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild |
| 25 |
@@ -38,6 +38,11 @@ DEPEND="${RDEPEND} |
| 26 |
sys-devel/gettext:* |
| 27 |
virtual/pkgconfig:*" |
| 28 |
|
| 29 |
+PATCHES=( |
| 30 |
+ "${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch" |
| 31 |
+ "${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch" |
| 32 |
+) |
| 33 |
+ |
| 34 |
src_prepare() { |
| 35 |
gnome2_src_prepare |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/app-arch/engrampa/engrampa-1.12.0.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild |
| 39 |
similarity index 93% |
| 40 |
rename from app-arch/engrampa/engrampa-1.12.0.ebuild |
| 41 |
rename to app-arch/engrampa/engrampa-1.12.0-r1.ebuild |
| 42 |
index c1ec897..48c44f3 100644 |
| 43 |
--- a/app-arch/engrampa/engrampa-1.12.0.ebuild |
| 44 |
+++ b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild |
| 45 |
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND} |
| 46 |
sys-devel/gettext:* |
| 47 |
virtual/pkgconfig:*" |
| 48 |
|
| 49 |
+PATCHES=( |
| 50 |
+ "${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch" |
| 51 |
+ "${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch" |
| 52 |
+) |
| 53 |
+ |
| 54 |
src_configure() { |
| 55 |
mate_src_configure \ |
| 56 |
--disable-run-in-place \ |
| 57 |
|
| 58 |
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 |
| 59 |
new file mode 100644 |
| 60 |
index 0000000..d0937a8 |
| 61 |
--- /dev/null |
| 62 |
+++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch |
| 63 |
@@ -0,0 +1,25 @@ |
| 64 |
+From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001 |
| 65 |
+From: monsta <monsta@×××××.ru> |
| 66 |
+Date: Thu, 24 Dec 2015 17:11:19 +0300 |
| 67 |
+Subject: [PATCH] 7z: correct checking for p7zip 15.09+ |
| 68 |
+ |
| 69 |
+from https://github.com/GNOME/file-roller/commit/ed9c3fd2 |
| 70 |
+ |
| 71 |
+fixes https://github.com/mate-desktop/engrampa/issues/114 |
| 72 |
+--- |
| 73 |
+ src/fr-command-7z.c | 2 +- |
| 74 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 75 |
+ |
| 76 |
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c |
| 77 |
+index 297ba1b..0b784f7 100644 |
| 78 |
+--- a/src/fr-command-7z.c |
| 79 |
++++ b/src/fr-command-7z.c |
| 80 |
+@@ -106,7 +106,7 @@ list__process_line (char *line, |
| 81 |
+ strncpy (version, ver_start, ver_len); |
| 82 |
+ version[ver_len] = 0; |
| 83 |
+ |
| 84 |
+- if (strcmp (version, "4.55") < 0) |
| 85 |
++ if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.')) |
| 86 |
+ p7z_comm->old_style = TRUE; |
| 87 |
+ else |
| 88 |
+ p7z_comm->old_style = FALSE; |
| 89 |
|
| 90 |
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 |
| 91 |
new file mode 100644 |
| 92 |
index 0000000..4e25898 |
| 93 |
--- /dev/null |
| 94 |
+++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch |
| 95 |
@@ -0,0 +1,30 @@ |
| 96 |
+From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001 |
| 97 |
+From: sc0w <scow@××××××.net> |
| 98 |
+Date: Wed, 25 May 2016 02:29:21 +0200 |
| 99 |
+Subject: [PATCH] p7zip-rar 15.14 supported |
| 100 |
+ |
| 101 |
+since 15.14, p7zip-rar uses the plugin Rar.so to handle archives |
| 102 |
+ |
| 103 |
+It can find on /usr/lib/ or /usr/libexec/ |
| 104 |
+ |
| 105 |
+If someone has it in another folder, we can add it |
| 106 |
+ |
| 107 |
+Fixes #136 |
| 108 |
+--- |
| 109 |
+ src/fr-command-7z.c | 3 ++- |
| 110 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 111 |
+ |
| 112 |
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c |
| 113 |
+index 20cfa2c..a7d032e 100644 |
| 114 |
+--- a/src/fr-command-7z.c |
| 115 |
++++ b/src/fr-command-7z.c |
| 116 |
+@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand *comm, |
| 117 |
+ if (is_mime_type (mime_type, "application/x-rar") |
| 118 |
+ || is_mime_type (mime_type, "application/x-cbr")) |
| 119 |
+ { |
| 120 |
+- if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS)) |
| 121 |
++ 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) |
| 122 |
++ || 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)) |
| 123 |
+ capabilities |= FR_COMMAND_CAN_READ; |
| 124 |
+ } |
| 125 |
+ else |
Archives