Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Ark
Commits
573f3b14
Commit
573f3b14
authored
Jul 07, 2021
by
Friedrich W. H. Kossebau
Committed by
Elvis Angelaccio
Jul 10, 2021
Browse files
Revert addition of "application/zstd" as archive format
parent
0851b7a8
Changes
4
Show whitespace changes
Inline
Side-by-side
autotests/kerfuffle/data/simplearchive.tar.zstd
deleted
100644 → 0
View file @
0851b7a8
File deleted
autotests/kerfuffle/loadtest.cpp
View file @
573f3b14
...
...
@@ -238,14 +238,6 @@ void LoadTest::testProperties_data()
<<
false
<<
false
<<
false
<<
false
<<
false
<<
0
<<
Archive
::
Unencrypted
<<
QStringLiteral
(
"simplearchive"
)
<<
QString
();
/* mimetype "application/zstd" */
QTest
::
newRow
(
"zstd tarball"
)
<<
QFINDTESTDATA
(
"data/simplearchive.tar.zstd"
)
<<
QStringLiteral
(
"simplearchive"
)
<<
false
<<
false
<<
false
<<
false
<<
false
<<
0
<<
Archive
::
Unencrypted
<<
QStringLiteral
(
"simplearchive"
)
<<
QString
();
}
else
{
qDebug
()
<<
"zstd executable not found in path. Skipping zstd test."
;
}
...
...
plugins/libarchive/CMakeLists.txt
View file @
573f3b14
...
...
@@ -5,7 +5,7 @@ set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-co
set
(
SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES
"
${
SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES
}
application/x-lzma-compressed-tar;application/x-lzip-compressed-tar;application/x-tzo;application/x-lrzip-compressed-tar;application/x-lz4-compressed-tar;"
)
set
(
SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES
"application/vnd.debian.binary-package;application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;"
)
set
(
SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES
"
${
SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES
}
application/x-rpm;application/x-source-rpm;application/vnd.ms-cab-compressed;application/x-xar;application/x-iso9660-appimage;application/x-archive;"
)
set
(
SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES
"
${
SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES
}
application/
zstd;application/
x-zstd-compressed-tar;"
)
set
(
SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES
"
${
SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES
}
application/x-zstd-compressed-tar;"
)
set
(
INSTALLED_LIBARCHIVE_PLUGINS
""
)
...
...
@@ -49,7 +49,6 @@ set(SUPPORTED_READWRITE_MIMETYPES
\"
application/x-tzo
\"
,
\"
application/x-lrzip-compressed-tar
\"
,
\"
application/x-lz4-compressed-tar
\"
,
\"
application/zstd
\"
,
\"
application/x-zstd-compressed-tar"
)
configure_file
(
...
...
plugins/libarchive/kerfuffle_libarchive.json.cmake
View file @
573f3b14
...
...
@@ -134,10 +134,5 @@
"CompressionLevelDefault"
: 3,
"CompressionLevelMax"
: 22,
"CompressionLevelMin"
: 1
},
"application/zstd"
: {
"CompressionLevelDefault"
: 3,
"CompressionLevelMax"
: 22,
"CompressionLevelMin"
: 1
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment