engrampa: update to 1.26.0.
This commit is contained in:
skmpz
Andrew Benson
parent
6a2843ad6a
commit
b74627404a
2 changed files with 23 additions and 16 deletions
|
|
@ -1,7 +1,8 @@
|
|||
diff --git caja/caja-engrampa.c caja/caja-engrampa.c
|
||||
diff --git a/caja/caja-engrampa.c b/caja/caja-engrampa.c
|
||||
index ad89608..d4019ec 100644
|
||||
--- a/caja/caja-engrampa.c
|
||||
+++ b/caja/caja-engrampa.c
|
||||
@@ -191,7 +191,8 @@ static struct {
|
||||
@@ -195,7 +195,8 @@ static struct {
|
||||
{ "application/x-zip", TRUE },
|
||||
{ "application/x-zip-compressed", TRUE },
|
||||
{ "application/x-zoo", TRUE },
|
||||
|
|
@ -11,10 +12,11 @@ diff --git caja/caja-engrampa.c caja/caja-engrampa.c
|
|||
{ "application/x-zstd-compressed-tar", TRUE },
|
||||
{ "application/zip", TRUE },
|
||||
{ "multipart/x-zip", TRUE },
|
||||
diff --git configure.ac configure.ac
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5d03e6b..6305854 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -141,7 +141,6 @@ AC_ARG_ENABLE([magic],
|
||||
@@ -148,7 +148,6 @@ AC_ARG_ENABLE([magic],
|
||||
AS_HELP_STRING([--enable-magic], [use libmagic to detect file type]),,
|
||||
[enable_magic=no])
|
||||
|
||||
|
|
@ -22,7 +24,7 @@ diff --git configure.ac configure.ac
|
|||
if test x"$enable_magic" = x"yes" ; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -lmagic"
|
||||
@@ -154,47 +153,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
|
||||
@@ -161,47 +160,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
|
||||
[AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([libmagic is needed for magic])])
|
||||
|
||||
|
|
@ -70,7 +72,7 @@ diff --git configure.ac configure.ac
|
|||
LIBS="$save_LIBS"
|
||||
|
||||
MAGIC_CFLAGS=
|
||||
@@ -207,9 +165,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
|
||||
@@ -214,9 +172,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); }
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_MAGIC, test x"$enable_magic" != x"no")
|
||||
|
|
@ -80,19 +82,21 @@ diff --git configure.ac configure.ac
|
|||
|
||||
AC_ARG_VAR([CPIO], [Path to the `cpio` command])
|
||||
AC_PATH_PROGS(CPIO, gcpio cpio, cpio)
|
||||
diff --git data/engrampa.desktop.in.in data/engrampa.desktop.in.in
|
||||
diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in
|
||||
index c23c8ab..6d8c511 100644
|
||||
--- a/data/engrampa.desktop.in.in
|
||||
+++ b/data/engrampa.desktop.in.in
|
||||
@@ -11,7 +11,7 @@ Type=Application
|
||||
Icon=engrampa
|
||||
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
|
||||
Categories=GTK;Utility;Archiving;Compression;
|
||||
-MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
|
||||
+MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zstd;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
|
||||
-MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
|
||||
+MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zstd;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
|
||||
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
|
||||
Keywords=MATE;archive;manager;compression;
|
||||
X-MATE-DocPath=engrampa/engrampa.xml
|
||||
diff --git src/fr-command-cfile.c src/fr-command-cfile.c
|
||||
diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c
|
||||
index a914abe..93f641f 100644
|
||||
--- a/src/fr-command-cfile.c
|
||||
+++ b/src/fr-command-cfile.c
|
||||
@@ -301,7 +301,8 @@ fr_command_cfile_add (FrCommand *comm,
|
||||
|
|
@ -155,10 +159,11 @@ diff --git src/fr-command-cfile.c src/fr-command-cfile.c
|
|||
return PACKAGES ("zstd");
|
||||
|
||||
return NULL;
|
||||
diff --git src/fr-init.c src/fr-init.c
|
||||
diff --git a/src/fr-init.c b/src/fr-init.c
|
||||
index 7d7b313..57dfc40 100644
|
||||
--- a/src/fr-init.c
|
||||
+++ b/src/fr-init.c
|
||||
@@ -108,7 +108,8 @@ FrMimeTypeDescription mime_type_desc[] = {
|
||||
@@ -110,7 +110,8 @@ FrMimeTypeDescription mime_type_desc[] = {
|
||||
{ "application/x-xz", ".xz", N_("Xz compressed file"), 0 },
|
||||
{ "application/x-xz-compressed-tar", ".tar.xz", N_("Tar compressed with xz"), 0 },
|
||||
{ "application/x-zoo", ".zoo", N_("Zoo"), 0 },
|
||||
|
|
@ -168,7 +173,7 @@ diff --git src/fr-init.c src/fr-init.c
|
|||
{ "application/x-zstd-compressed-tar", ".tar.zst", N_("Tar compressed with zstd"), 0 },
|
||||
{ "application/zip", ".zip", N_("Zip"), 0 },
|
||||
{ NULL, NULL, NULL, 0 }
|
||||
@@ -181,7 +182,7 @@ FrExtensionType file_ext_type[] = {
|
||||
@@ -185,7 +186,7 @@ FrExtensionType file_ext_type[] = {
|
||||
{ ".Z", "application/x-compress" },
|
||||
{ ".zip", "application/zip" },
|
||||
{ ".zoo", "application/x-zoo" },
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# Template file for 'engrampa'
|
||||
pkgname=engrampa
|
||||
version=1.24.2
|
||||
version=1.26.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-magic --disable-schemas-compile --disable-packagekit"
|
||||
configure_args="--enable-magic --disable-schemas-compile --disable-packagekit
|
||||
--disable-static"
|
||||
hostmakedepends="glib-devel intltool itstool pkg-config cpio automake
|
||||
gettext-devel tar libtool mate-common autoconf-archive"
|
||||
makedepends="file-devel gtk+3-devel json-glib-devel libSM-devel libarchive-devel
|
||||
|
|
@ -13,8 +14,9 @@ short_desc="Archive manipulator for MATE"
|
|||
maintainer="skmpz <dem.procopiou@gmail.com>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://mate-desktop.org"
|
||||
changelog="https://raw.githubusercontent.com/mate-desktop/engrampa/master/NEWS"
|
||||
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
checksum=ee280d288c974732ec7bc2d1c3e18fa563b33a30f3e4cb3e976ebc71be6c4674
|
||||
checksum=97cdb2c22c32315a38803d4147dfad9de7309e30ce8f37ac9f600709ad075ee3
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue