From f990a18092a7194ab7679c151cfea6a2786c7d85 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 29 Oct 2015 23:18:43 +0200 Subject: [PATCH] ark: update supported MIME types nowdays .tar.gz and .tar.bz2 files are recognized as application/x-bzip and application/x-gzip respectively. also added application/x-gzip-compressed-tar because application/x-bzip-compressed-tar is in the list and I think that's a legacy one but should not hurt. Signed-off-by: Ivailo Monev --- ark/plugins/CMakeLists.txt | 4 ++-- ark/plugins/karchiveplugin/CMakeLists.txt | 6 +++--- ark/plugins/libarchive/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ark/plugins/CMakeLists.txt b/ark/plugins/CMakeLists.txt index 284cae71..3684dede 100644 --- a/ark/plugins/CMakeLists.txt +++ b/ark/plugins/CMakeLists.txt @@ -1,6 +1,6 @@ -if (LibArchive_FOUND) +if(LibArchive_FOUND) add_subdirectory( libarchive ) -endif (LibArchive_FOUND) +endif() add_subdirectory( clirarplugin ) add_subdirectory( libsinglefileplugin ) diff --git a/ark/plugins/karchiveplugin/CMakeLists.txt b/ark/plugins/karchiveplugin/CMakeLists.txt index 8ef4382e..192f26c3 100644 --- a/ark/plugins/karchiveplugin/CMakeLists.txt +++ b/ark/plugins/karchiveplugin/CMakeLists.txt @@ -1,6 +1,6 @@ ########### next target ############### -set(SUPPORTED_KARCHIVE_MIMETYPES "application/zip;application/x-zip-compressed;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;") +set(SUPPORTED_KARCHIVE_MIMETYPES "application/zip;application/x-bzip;application/x-gzip;application/x-zip-compressed;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-gzip-compressed-tar;") set(kerfuffle_karchive_SRCS karchiveplugin.cpp) @@ -9,8 +9,8 @@ kde4_add_plugin(kerfuffle_karchive ${kerfuffle_karchive_SRCS}) target_link_libraries(kerfuffle_karchive ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle ) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_karchive.desktop.cmake - ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_karchive.desktop + ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_karchive.desktop.cmake + ${CMAKE_CURRENT_BINARY_DIR}/kerfuffle_karchive.desktop ) ########### install files ############### diff --git a/ark/plugins/libarchive/CMakeLists.txt b/ark/plugins/libarchive/CMakeLists.txt index 80da9757..2ed5067c 100644 --- a/ark/plugins/libarchive/CMakeLists.txt +++ b/ark/plugins/libarchive/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${LibArchive_INCLUDE_DIRS}) ########### next target ############### set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;application/x-rpm;application/x-source-rpm;application/vnd.ms-cab-compressed;application/x-servicepack;") -set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/x-java-archive;application/zip;application/x-7z-compressed;") +set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip;application/x-gzip;application/x-bzip-compressed-tar;application/x-gzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/x-java-archive;application/zip;application/x-7z-compressed;") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_libarchive_readonly.desktop.cmake -- 2.11.0