[ark/Applications/16.04] plugins: Backport commit 9a9a851049cd904f08c9594cc6aacf696886404e

Elvis Angelaccio elvis.angelaccio at kde.org
Thu Nov 10 18:44:30 GMT 2016


Git commit e05e5c4504428bd70d1a780904ef6e1a62482e93 by Elvis Angelaccio.
Committed on 10/11/2016 at 18:36.
Pushed by elvisangelaccio into branch 'Applications/16.04'.

Backport commit 9a9a851049cd904f08c9594cc6aacf696886404e

This fixes RAR support with Ark 16.04.3 and shared-mime-info >= 1.7
If you ship the combination above (e.g. Kubuntu 16.10 does), please
update your Ark package and include this commit.

CCMAIL: kde-distro-packagers at kde.org
CCBUG: 372300

M  +1    -1    plugins/clirarplugin/CMakeLists.txt
M  +3    -2    plugins/clirarplugin/kerfuffle_clirar.json
M  +1    -1    plugins/cliunarchiverplugin/CMakeLists.txt
M  +3    -2    plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json

http://commits.kde.org/ark/e05e5c4504428bd70d1a780904ef6e1a62482e93

diff --git a/plugins/clirarplugin/CMakeLists.txt b/plugins/clirarplugin/CMakeLists.txt
index 94fd22a..06051ad 100644
--- a/plugins/clirarplugin/CMakeLists.txt
+++ b/plugins/clirarplugin/CMakeLists.txt
@@ -1,6 +1,6 @@
 ########### next target ###############
 
-set(SUPPORTED_CLIRAR_MIMETYPES "application/x-rar;")
+set(SUPPORTED_CLIRAR_MIMETYPES "application/vnd.rar;application/x-rar;")
 
 set(kerfuffle_clirar_SRCS cliplugin.cpp)
 
diff --git a/plugins/clirarplugin/kerfuffle_clirar.json b/plugins/clirarplugin/kerfuffle_clirar.json
index 149b1c1..cac46b7 100644
--- a/plugins/clirarplugin/kerfuffle_clirar.json
+++ b/plugins/clirarplugin/kerfuffle_clirar.json
@@ -14,6 +14,7 @@
         "Id": "kerfuffle_clirar", 
         "License": "GPLv2+", 
         "MimeTypes": [
+            "application/vnd.rar",
             "application/x-rar"
         ], 
         "Name": "RAR archive plugin", 
@@ -50,7 +51,7 @@
         "Version": "0.0.1", 
         "Website": "http://www.kde.org"
     }, 
-    "MimeType": "application/x-rar;", 
+    "MimeType": "application/vnd.rar;application/x-rar;",
     "X-KDE-Kerfuffle-APIRevision": "1", 
     "X-KDE-Kerfuffle-EncryptEntries": "application/x-rar", 
     "X-KDE-Kerfuffle-EncryptHeader": "application/x-rar", 
@@ -58,4 +59,4 @@
     "X-KDE-Kerfuffle-ReadWrite": "true", 
     "X-KDE-Kerfuffle-ReadWriteExecutables": "rar", 
     "X-KDE-Priority": "120"
-}
\ No newline at end of file
+}
diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt
index 9178b9c..b38cb78 100644
--- a/plugins/cliunarchiverplugin/CMakeLists.txt
+++ b/plugins/cliunarchiverplugin/CMakeLists.txt
@@ -1,6 +1,6 @@
 ########### next target ###############
 
-set(SUPPORTED_CLIUNARCHIVER_MIMETYPES "application/x-rar;")
+set(SUPPORTED_CLIUNARCHIVER_MIMETYPES "application/vnd.rar;application/x-rar;")
 
 set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp)
 
diff --git a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json
index c9fe2fe..7e17805 100644
--- a/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json
+++ b/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json
@@ -14,6 +14,7 @@
         "Id": "kerfuffle_cliunarchiver", 
         "License": "GPLv2+", 
         "MimeTypes": [
+            "application/vnd.rar",
             "application/x-rar"
         ], 
         "Name": "The Unarchiver plugin", 
@@ -46,9 +47,9 @@
         "Version": "0.0.1", 
         "Website": "http://www.kde.org"
     }, 
-    "MimeType": "application/x-rar;", 
+    "MimeType": "application/vnd.rar;application/x-rar;",
     "X-KDE-Kerfuffle-APIRevision": "1", 
     "X-KDE-Kerfuffle-ReadOnlyExecutables": "lsar;unar;", 
     "X-KDE-Kerfuffle-ReadWrite": "false", 
     "X-KDE-Priority": "100"
-}
\ No newline at end of file
+}



More information about the Distributions mailing list