upgpkg: engrampa-thunar-gtk2 1.14.1-2

4 files changed, 107 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36d1c4b03382..afd45928a4c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Oct 19 01:01:46 UTC 2016
+# Sun Dec 11 20:28:15 UTC 2016
 pkgbase = engrampa-thunar-gtk2
 	pkgdesc = Archive manipulator from MATE without Caja dependency (GTK2 version)
 	pkgver = 1.14.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mate-desktop.org
 	arch = i686
 	arch = x86_64
@@ -28,11 +28,13 @@ pkgbase = engrampa-thunar-gtk2
 	source = http://pub.mate-desktop.org/releases/1.14/engrampa-1.14.1.tar.xz
 	source = fr-rpm-bsdtar.patch
 	source = engrampa.tap
-	source = engrampa-1.16.0-changes.patch
+	source = 001-engrampa-1.17.0-changes.patch
+	source = 002-add-firefox-addon-mimetype.patch
 	sha1sums = 1245f5203b37b842cfaf818781b17cd22f1234b1
 	sha1sums = 219b05a979bf6f249aaae27964f02345fd81168d
 	sha1sums = 84f023a660c77cf046cff71d1d890f7de5af4110
-	sha1sums = 75cef1a9940d317a18580151e64cd491cd238f56
+	sha1sums = 5a199fa595f86ee5e324ea5c7d3412ff3e29bb7b
+	sha1sums = 616ed7f0fe0fc2a2f25106963052fc0d7f063d6b
 
 pkgname = engrampa-thunar-gtk2
 
diff --git a/engrampa-1.16.0-changes.patch b/001-engrampa-1.17.0-changes.patch
index 9000eb5c7596..b49d729a57a1 100644
--- a/engrampa-1.16.0-changes.patch
+++ b/001-engrampa-1.17.0-changes.patch
@@ -1,6 +1,6 @@
-diff -aur a/src/file-data.c b/src/file-data.c
+diff '--color=auto' -aur a/src/file-data.c b/src/file-data.c
 --- a/src/file-data.c	2016-04-07 04:37:58.000000000 -0700
-+++ b/src/file-data.c	2016-07-28 00:24:43.000000000 -0700
++++ b/src/file-data.c	2016-06-10 01:41:48.000000000 -0700
 @@ -37,7 +37,7 @@
  	fdata->content_type = NULL;
  	fdata->free_original_path = FALSE;
@@ -107,9 +107,9 @@ diff -aur a/src/file-data.c b/src/file-data.c
 +
  	return -1;
  }
-diff -aur a/src/file-data.h b/src/file-data.h
+diff '--color=auto' -aur a/src/file-data.h b/src/file-data.h
 --- a/src/file-data.h	2016-04-07 04:37:58.000000000 -0700
-+++ b/src/file-data.h	2016-07-28 00:24:43.000000000 -0700
++++ b/src/file-data.h	2016-06-10 01:41:48.000000000 -0700
 @@ -40,13 +40,14 @@
  	gboolean    dir;              /* Whether this is a directory listed in the archive */
  	goffset     dir_size;
@@ -151,9 +151,9 @@ diff -aur a/src/file-data.h b/src/file-data.h
 +				               const char    *path);
  
  #endif /* FILE_DATA_H */
-diff -aur a/src/fr-command-7z.c b/src/fr-command-7z.c
+diff '--color=auto' -aur a/src/fr-command-7z.c b/src/fr-command-7z.c
 --- a/src/fr-command-7z.c	2016-04-07 04:37:58.000000000 -0700
-+++ b/src/fr-command-7z.c	2016-09-13 21:04:59.000000000 -0700
++++ b/src/fr-command-7z.c	2016-09-26 01:58:20.000000000 -0700
 @@ -39,7 +39,8 @@
  static void fr_command_7z_class_init  (FrCommand7zClass *class);
  static void fr_command_7z_init        (FrCommand        *afile);
@@ -261,9 +261,61 @@ diff -aur a/src/fr-command-7z.c b/src/fr-command-7z.c
  				capabilities |= FR_COMMAND_CAN_READ;
  		}
  		else
-diff -aur a/src/fr-init.c b/src/fr-init.c
+diff '--color=auto' -aur a/src/fr-command-lha.c b/src/fr-command-lha.c
+--- a/src/fr-command-lha.c	2016-04-07 04:37:58.000000000 -0700
++++ b/src/fr-command-lha.c	2016-09-26 01:58:20.000000000 -0700
+@@ -120,6 +120,11 @@
+ 		fields[i++] = g_strdup ("");
+ 		line += strlen ("[unknown]");
+ 	}
++	else if (strncmp (line, "[Amiga]", 7) == 0) {
++		fields[i++] = g_strdup ("");
++		fields[i++] = g_strdup ("");
++		line += strlen ("[Amiga]");
++	}
+ 
+ 	scan = eat_spaces (line);
+ 	for (; i < n_fields; i++) {
+@@ -150,6 +155,9 @@
+ 	if (strncmp (line, "[unknown]", 9) == 0)
+ 		n--;
+ 
++	if (strncmp (line, "[Amiga]", 7) == 0)
++		n--;
++
+ 	field = eat_spaces (line);
+ 	for (i = 0; i < n; i++) {
+ 		field = strchr (field, ' ');
+diff '--color=auto' -aur a/src/fr-command-tar.c b/src/fr-command-tar.c
+--- a/src/fr-command-tar.c	2016-05-21 07:44:10.000000000 -0700
++++ b/src/fr-command-tar.c	2016-11-24 13:07:21.000000000 -0700
+@@ -198,7 +198,10 @@
+ 		fr_process_add_arg (comm->process, "-z");
+ 
+ 	else if (is_mime_type (comm->mime_type, "application/x-bzip-compressed-tar"))
+-		fr_process_add_arg (comm->process, "--use-compress-program=bzip2");
++		if (is_program_in_path ("lbzip2"))
++			fr_process_add_arg (comm->process, "--use-compress-program=lbzip2");
++		else
++			fr_process_add_arg (comm->process, "--use-compress-program=bzip2");
+ 
+ 	else if (is_mime_type (comm->mime_type, "application/x-tarz")) {
+ 		if (is_program_in_path ("gzip"))
+@@ -216,7 +219,10 @@
+ 		fr_process_add_arg (comm->process, "--use-compress-program=lzma");
+ 
+ 	else if (is_mime_type (comm->mime_type, "application/x-xz-compressed-tar"))
+-		fr_process_add_arg (comm->process, "--use-compress-program=xz");
++		if (is_program_in_path ("pixz"))
++			fr_process_add_arg (comm->process, "--use-compress-program=pixz");
++		else
++			fr_process_add_arg (comm->process, "--use-compress-program=xz");
+ 
+ 	else if (is_mime_type (comm->mime_type, "application/x-lzop-compressed-tar"))
+ 		fr_process_add_arg (comm->process, "--use-compress-program=lzop");
+diff '--color=auto' -aur a/src/fr-init.c b/src/fr-init.c
 --- a/src/fr-init.c	2016-04-07 04:37:58.000000000 -0700
-+++ b/src/fr-init.c	2016-09-20 17:27:10.182630316 -0700
++++ b/src/fr-init.c	2016-12-10 17:51:06.636727000 -0700
 @@ -342,6 +342,7 @@
  
  	register_command (FR_TYPE_COMMAND_TAR);
diff --git a/002-add-firefox-addon-mimetype.patch b/002-add-firefox-addon-mimetype.patch
new file mode 100644
index 000000000000..4b1da1fe8bc3
--- /dev/null
+++ b/002-add-firefox-addon-mimetype.patch
@@ -0,0 +1,30 @@
+diff '--color=auto' -aur a/src/fr-command-zip.c b/src/fr-command-zip.c
+--- a/src/fr-command-zip.c	2016-04-07 04:37:58.000000000 -0700
++++ b/src/fr-command-zip.c	2016-11-26 15:18:06.990065648 -0700
+@@ -383,6 +383,7 @@
+ 
+ const char *zip_mime_type[] = { "application/x-cbz",
+ 				"application/x-ms-dos-executable",
++				"application/x-xpinstall",
+ 				"application/zip",
+ 				NULL };
+ 
+diff '--color=auto' -aur a/src/fr-init.c b/src/fr-init.c
+--- a/src/fr-init.c	2016-04-07 04:37:58.000000000 -0700
++++ b/src/fr-init.c	2016-11-26 15:01:15.596721442 -0700
+@@ -97,6 +97,7 @@
+ 	{ "application/x-tarz",                 ".tar.Z",    N_("Tar compressed with compress (.tar.Z)"), 0 },
+ 	{ "application/x-stuffit",              ".sit",      NULL, 0 },
+ 	{ "application/x-war",                  ".war",      N_("War (.war)"), 0 },
++	{ "application/x-xpinstall",            ".xpi",      N_("Firefox Addon Installer (.xpi)"), 0 },
+ 	{ "application/x-xz",                   ".xz",       N_("Xz (.xz)"), 0 },
+ 	{ "application/x-xz-compressed-tar",    ".tar.xz",   N_("Tar compressed with xz (.tar.xz)"), 0 },
+ 	{ "application/x-zoo",                  ".zoo",      N_("Zoo (.zoo)"), 0 },
+@@ -155,6 +156,7 @@
+ 	{ ".tzo", "application/x-lzop-compressed-tar" },
+ 	{ ".war", "application/x-war" },
+ 	{ ".wim", "application/x-ms-wim" },
++	{ ".xpi", "application/x-xpinstall" },
+ 	{ ".xz", "application/x-xz" },
+ 	{ ".z", "application/x-gzip" },
+ 	{ ".Z", "application/x-compress" },
diff --git a/PKGBUILD b/PKGBUILD
index 2044366e9737..fe804b2c2fc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,8 @@
 #   without Caja dependency and with Thunar integration
 #   with some non-GTK3 changes backported from subsequent upstream versions
 #     I'm not a developer, so don't expect too much. :)
+#   I also added the Firefox .xpi mimetype to make working with extensions easier.
+#     If you don't want that, comment out the patch in the prepare() array below.
 #
 # note: if you get "No suitable archive manager found" errors, you need
 #       to adjust Xfce Settings > MIME Type Editor associations for Engrampa
@@ -14,8 +16,9 @@
 pkgname=engrampa-thunar-gtk2
 _pkgname=engrampa
 _ver=1.14
+_patchver=1.17.0
 pkgver=${_ver}.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Archive manipulator from MATE without Caja dependency (GTK2 version)"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -32,18 +35,22 @@ replaces=('engrampa')
 source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgname}-${pkgver}.tar.xz"
         'fr-rpm-bsdtar.patch'
         'engrampa.tap'
-        'engrampa-1.16.0-changes.patch')
+        "001-engrampa-${_patchver}-changes.patch"
+        '002-add-firefox-addon-mimetype.patch')
 sha1sums=('1245f5203b37b842cfaf818781b17cd22f1234b1'
           '219b05a979bf6f249aaae27964f02345fd81168d'
           '84f023a660c77cf046cff71d1d890f7de5af4110'
-          '75cef1a9940d317a18580151e64cd491cd238f56')
+          '5a199fa595f86ee5e324ea5c7d3412ff3e29bb7b'
+          '616ed7f0fe0fc2a2f25106963052fc0d7f063d6b')
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     # this patch 'depends' on libarchive
     patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
     # patch to apply some non-GTK3 changes from subsequent upstream versions
-    patch -Np1 -i "${srcdir}/engrampa-1.16.0-changes.patch"
+    patch -Np1 -i "${srcdir}/001-engrampa-${_patchver}-changes.patch"
+    # patch to add Firefox Addon .xpi mimetype
+    patch -Np1 -i "${srcdir}/002-add-firefox-addon-mimetype.patch"
 }
 
 build() {