Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2016-10-18 10:26:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2016-10-06 12:27:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2016-10-18 10:26:28.000000000 +0200 @@ -1,0 +2,30 @@ +Thu Oct 13 18:00:55 UTC 2016 - [email protected] + +- Drop all patches, merged upstream: + * 0001-SVN_SILENT-made-messages-after-extraction.patch + * 0002-Add-support-for-application-vnd.rar-fixes-opening-RA.patch + * 0003-Stop-crashing-when-dropping-on-empty-ArchiveView.patch + * 0004-Show-extraction-dialog-only-after-archive-has-been-l.patch + * 0005-SVN_SILENT-made-messages-after-extraction.patch + * 0006-Accept-drop-events-when-creating-a-new-archive.patch + * 0007-SVN_SILENT-made-messages-after-extraction.patch + * 0008-Fix-potential-crash-when-aborting-a-ListJob.patch + * 0009-Improve-focus-handling-of-internal-previewer.patch + * 0010-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch + * 0011-Fix-drag-and-drop-with-RPM-archives.patch + * 0012-Add-test-cases-for-RPM-and-AppImage.patch + * 0013-Fix-drag-and-drop-extraction-of-entries-from-certain.patch + * 0014-Fix-drag-and-drop-extraction-of-parentless-files.patch + +------------------------------------------------------------------- +Wed Oct 12 05:03:53 UTC 2016 - [email protected] + +- Drop patches applied upstream + +------------------------------------------------------------------- +Tue Oct 11 20:45:04 UTC 2016 - [email protected] + +- KDE Applications 16.08.2 +- https://www.kde.org/announcements/announce-applications-16.08.2.php + +------------------------------------------------------------------- Old: ---- 0001-SVN_SILENT-made-messages-after-extraction.patch 0002-Add-support-for-application-vnd.rar-fixes-opening-RA.patch 0003-Stop-crashing-when-dropping-on-empty-ArchiveView.patch 0004-Show-extraction-dialog-only-after-archive-has-been-l.patch 0005-SVN_SILENT-made-messages-after-extraction.patch 0006-Accept-drop-events-when-creating-a-new-archive.patch 0007-SVN_SILENT-made-messages-after-extraction.patch 0008-Fix-potential-crash-when-aborting-a-ListJob.patch 0009-Improve-focus-handling-of-internal-previewer.patch 0010-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch 0011-Fix-drag-and-drop-with-RPM-archives.patch 0012-Add-test-cases-for-RPM-and-AppImage.patch 0013-Fix-drag-and-drop-extraction-of-entries-from-certain.patch 0014-Fix-drag-and-drop-extraction-of-parentless-files.patch ark-16.08.1.tar.xz New: ---- ark-16.08.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.kmVUQ2/_old 2016-10-18 10:26:30.000000000 +0200 +++ /var/tmp/diff_new_pack.kmVUQ2/_new 2016-10-18 10:26:30.000000000 +0200 @@ -17,29 +17,14 @@ Name: ark -Version: 16.08.1 +Version: 16.08.2 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ark-%{version}.tar.xz -# PATCH-FIX-UPSTREAM Apply all patches until 593568d (binary diffs stripped) -# (kde#369535, kde#369390, kde#369401, kde#369283, kde#368807, kde#368786) -Patch1: 0001-SVN_SILENT-made-messages-after-extraction.patch -Patch2: 0002-Add-support-for-application-vnd.rar-fixes-opening-RA.patch -Patch3: 0003-Stop-crashing-when-dropping-on-empty-ArchiveView.patch -Patch4: 0004-Show-extraction-dialog-only-after-archive-has-been-l.patch -Patch5: 0005-SVN_SILENT-made-messages-after-extraction.patch -Patch6: 0006-Accept-drop-events-when-creating-a-new-archive.patch -Patch7: 0007-SVN_SILENT-made-messages-after-extraction.patch -Patch8: 0008-Fix-potential-crash-when-aborting-a-ListJob.patch -Patch9: 0009-Improve-focus-handling-of-internal-previewer.patch -Patch10: 0010-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch -Patch11: 0011-Fix-drag-and-drop-with-RPM-archives.patch -Patch12: 0012-Add-test-cases-for-RPM-and-AppImage.patch -Patch13: 0013-Fix-drag-and-drop-extraction-of-entries-from-certain.patch -Patch14: 0014-Fix-drag-and-drop-extraction-of-parentless-files.patch + BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: karchive-devel >= 5.2.0 BuildRequires: kconfig-devel >= 5.2.0 @@ -76,20 +61,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 %build %cmake_kf5 -d build ++++++ ark-16.08.1.tar.xz -> ark-16.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/CMakeLists.txt new/ark-16.08.2/CMakeLists.txt --- old/ark-16.08.1/CMakeLists.txt 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/CMakeLists.txt 2016-10-10 14:25:46.000000000 +0200 @@ -7,7 +7,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/app/compressfileitemaction.json new/ark-16.08.2/app/compressfileitemaction.json --- old/ark-16.08.1/app/compressfileitemaction.json 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/app/compressfileitemaction.json 2016-10-10 14:25:46.000000000 +0200 @@ -1,15 +1,36 @@ { "KPlugin": { - "Icon": "ark", + "Icon": "ark", "MimeTypes": [ - "application/octet-stream", + "application/octet-stream", "inode/directory" - ], - "Name": "'Compress' service menu", + ], + "Name": "'Compress' service menu", + "Name[ca@valencia]": "Menú de servei «Comprimeix»", + "Name[ca]": "Menú de servei «Comprimeix»", + "Name[cs]": "Servisní nabídka 'Zkomprimovat'", + "Name[de]": "„Komprimieren“ im Servicemenü", + "Name[es]": "Menú de servicio para «Comprimir»", + "Name[et]": "Tihendamise teenusemenüü", + "Name[fi]": "Pakkaa-palveluvalikko", + "Name[he]": "תפריט שירות \"דחיסה\"", + "Name[it]": "Menu di servizio «Comprimi»", + "Name[nl]": "Servicemenu 'Comprimeren'", + "Name[pl]": "Menu usługi 'Spakuj'", + "Name[pt]": "Menu do serviço 'Comprimir'", + "Name[sk]": "Servisná ponuka 'Zbaliť'", + "Name[sl]": "Meni storitve stiskanja", + "Name[sr@ijekavian]": "Сервисни мени компресовања", + "Name[sr@ijekavianlatin]": "Servisni meni kompresovanja", + "Name[sr@latin]": "Servisni meni kompresovanja", + "Name[sr]": "Сервисни мени компресовања", + "Name[sv]": "'Tjänstmeny 'Komprimera'", + "Name[uk]": "Службове меню «Стиснути»", + "Name[x-test]": "xx'Compress' service menuxx", "ServiceTypes": [ "KFileItemAction/Plugin" ] - }, - "MimeType": "application/octet-stream;inode/directory;", + }, + "MimeType": "application/octet-stream;inode/directory;", "X-KDE-Require": "Write" -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/app/extractfileitemaction.json new/ark-16.08.2/app/extractfileitemaction.json --- old/ark-16.08.1/app/extractfileitemaction.json 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/app/extractfileitemaction.json 2016-10-10 14:25:46.000000000 +0200 @@ -1,13 +1,34 @@ { "KPlugin": { - "Icon": "ark", + "Icon": "ark", "MimeTypes": [ "application/octet-stream" - ], - "Name": "'Extract' service menu", + ], + "Name": "'Extract' service menu", + "Name[ca@valencia]": "Menú de servei «Extreu»", + "Name[ca]": "Menú de servei «Extreu»", + "Name[cs]": "Servisní nabídka 'Rozbalit'", + "Name[de]": "„Entpacken“ im Servicemenü", + "Name[es]": "Menú de servicio para «Extraer»", + "Name[et]": "Lahtipakkimise teenusemenüü", + "Name[fi]": "Pura-palveluvalikko", + "Name[he]": "תפריט שירות \"חילוץ\"", + "Name[it]": "Menu di servizio «Estrai»", + "Name[nl]": "Servicemenu 'Uitpakken'", + "Name[pl]": "Menu usługi 'Wypakuj'", + "Name[pt]": "Menu do serviço 'Extrair'", + "Name[sk]": "Servisná ponuka 'Rozbaliť'", + "Name[sl]": "Meni storitve razširjanja", + "Name[sr@ijekavian]": "Сервисни мени распакивања", + "Name[sr@ijekavianlatin]": "Servisni meni raspakivanja", + "Name[sr@latin]": "Servisni meni raspakivanja", + "Name[sr]": "Сервисни мени распакивања", + "Name[sv]": "'Tjänstmeny 'Packa upp'", + "Name[uk]": "Службове меню «Видобути»", + "Name[x-test]": "xx'Extract' service menuxx", "ServiceTypes": [ "KFileItemAction/Plugin" ] - }, + }, "MimeType": "application/octet-stream;" -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/autotests/kerfuffle/adddialogtest.cpp new/ark-16.08.2/autotests/kerfuffle/adddialogtest.cpp --- old/ark-16.08.1/autotests/kerfuffle/adddialogtest.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/autotests/kerfuffle/adddialogtest.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -79,8 +79,8 @@ qDebug() << "7z format not available, skipping test."; } - if (writeMimeTypes.contains(QStringLiteral("application/x-rar"))) { - QTest::newRow("rar") << QStringLiteral("application/x-rar") << true << 2 << 5; + if (writeMimeTypes.contains(QStringLiteral("application/vnd.rar"))) { + QTest::newRow("rar") << QStringLiteral("application/vnd.rar") << true << 2 << 5; } else { qDebug() << "rar format not available, skipping test."; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/autotests/kerfuffle/addtoarchivetest.cpp new/ark-16.08.2/autotests/kerfuffle/addtoarchivetest.cpp --- old/ark-16.08.1/autotests/kerfuffle/addtoarchivetest.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/autotests/kerfuffle/addtoarchivetest.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -153,7 +153,7 @@ qDebug() << "7z/zip executable not found in path. Skipping compress-here-(ZIP) tests."; } - if (!PluginManager().preferredWritePluginsFor(QMimeDatabase().mimeTypeForName(QStringLiteral("application/x-rar"))).isEmpty()) { + if (!PluginManager().preferredWritePluginsFor(QMimeDatabase().mimeTypeForName(QStringLiteral("application/vnd.rar"))).isEmpty()) { QTest::newRow("compress here (as RAR) - dir with files") << QStringLiteral("rar") << QStringList {QFINDTESTDATA("data/testdir")} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/autotests/kerfuffle/archivetest.cpp new/ark-16.08.2/autotests/kerfuffle/archivetest.cpp --- old/ark-16.08.1/autotests/kerfuffle/archivetest.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/autotests/kerfuffle/archivetest.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -537,13 +537,22 @@ << optionsPreservePaths << 6; - archivePath = QFINDTESTDATA("data/hello-2.8-x86_64.AppImage"); + archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage"); QTest::newRow("extract all entries from an AppImage with path") << archivePath << QVariantList() << optionsPreservePaths << 7; + archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage"); + QTest::newRow("extract selected entries from an AppImage with path") + << archivePath + << QVariantList { + QVariant::fromValue(fileRootNodePair(QStringLiteral("./usr/bin/hello"), QString())) + } + << optionsPreservePaths + << 3; + archivePath = QFINDTESTDATA("data/archive-multivolume.7z.001"); QTest::newRow("extract all entries from a multivolume 7z archive with path") << archivePath @@ -557,6 +566,26 @@ << QVariantList() << optionsPreservePaths << 3; + + archivePath = QFINDTESTDATA("data/firmware-pine64-20160329-6.1.aarch64.rpm"); + QTest::newRow("extract selected entries from rpm with path") + << archivePath + << QVariantList { + QVariant::fromValue(fileRootNodePair(QStringLiteral("./boot/sunxi-spl.bin"), QString())) + } + << optionsPreservePaths + << 2; + + archivePath = QFINDTESTDATA("data/firmware-pine64-20160329-6.1.aarch64.rpm"); + QTest::newRow("#369535: broken drag-and-drop from rpm") + << archivePath + << QVariantList { + // Remember that RPM paths start with ./ + QVariant::fromValue(fileRootNodePair(QStringLiteral("./boot/sunxi-spl.bin"), QStringLiteral("boot/"))), + QVariant::fromValue(fileRootNodePair(QStringLiteral("./boot/u-boot.img"), QStringLiteral("boot/"))) + } + << dragAndDropOptions + << 2; } void ArchiveTest::testExtraction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/autotests/kerfuffle/createdialogtest.cpp new/ark-16.08.2/autotests/kerfuffle/createdialogtest.cpp --- old/ark-16.08.1/autotests/kerfuffle/createdialogtest.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/autotests/kerfuffle/createdialogtest.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -78,8 +78,8 @@ qDebug() << "7z format not available in CreateDialog, skipping test."; } - if (writeMimeTypes.contains(QStringLiteral("application/x-rar"))) { - QTest::newRow("rar") << QStringLiteral("application/x-rar"); + if (writeMimeTypes.contains(QStringLiteral("application/vnd.rar"))) { + QTest::newRow("rar") << QStringLiteral("application/vnd.rar"); } else { qDebug() << "rar format not available in CreateDialog, skipping test."; } @@ -133,8 +133,8 @@ qDebug() << "7z format not available in CreateDialog, skipping test."; } - if (m_pluginManager.supportedWriteMimeTypes().contains(QStringLiteral("application/x-rar"))) { - QTest::newRow("rar") << QStringLiteral("application/x-rar") << true << true; + if (m_pluginManager.supportedWriteMimeTypes().contains(QStringLiteral("application/vnd.rar"))) { + QTest::newRow("rar") << QStringLiteral("application/vnd.rar") << true << true; } else { qDebug() << "rar format not available in CreateDialog, skipping test."; } Files old/ark-16.08.1/autotests/kerfuffle/data/firmware-pine64-20160329-6.1.aarch64.rpm and new/ark-16.08.2/autotests/kerfuffle/data/firmware-pine64-20160329-6.1.aarch64.rpm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/kerfuffle/mime/kerfuffle.xml new/ark-16.08.2/kerfuffle/mime/kerfuffle.xml --- old/ark-16.08.1/kerfuffle/mime/kerfuffle.xml 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/kerfuffle/mime/kerfuffle.xml 2016-10-10 14:25:46.000000000 +0200 @@ -5,12 +5,14 @@ <comment xml:lang="ca">Arxiu tar (comprimit amb LZIP)</comment> <comment xml:lang="ca@valencia">Arxiu tar (comprimit amb LZIP)</comment> <comment xml:lang="cs">Archiv Tar (komprimovaný lzip)</comment> + <comment xml:lang="de">Tar-Archiv (lzip-komprimiert)</comment> <comment xml:lang="en_GB">Tar archive (lzip-compressed)</comment> <comment xml:lang="es">Archivo comprimido Tar (comprimido con lzip)</comment> <comment xml:lang="et">Tar-arhiiv (lzip-tihendusega)</comment> <comment xml:lang="nl">Tar-archief (lzip-gecomprimeerd)</comment> <comment xml:lang="pl">Archiwum Tar (kompresja lzip)</comment> <comment xml:lang="pt">Pacote TAR (comprimido com Lzip)</comment> + <comment xml:lang="pt_BR">Arquivo tar (compressão lzip)</comment> <comment xml:lang="sk">Tar archív (lzip komprimovaný)</comment> <comment xml:lang="sl">Arhiv tar (stisnjen z lzip)</comment> <comment xml:lang="sr">тар архива (ЛЗИП‑компресована)</comment> @@ -26,12 +28,14 @@ <comment xml:lang="ca">Arxiu XAR</comment> <comment xml:lang="ca@valencia">Arxiu XAR</comment> <comment xml:lang="cs">Archiv XAR</comment> + <comment xml:lang="de">XAR-Archiv</comment> <comment xml:lang="en_GB">XAR archive</comment> <comment xml:lang="es">Archivo comprimido XAR</comment> <comment xml:lang="et">XAR-arhiiv</comment> <comment xml:lang="nl">XAR-archief</comment> <comment xml:lang="pl">Archiwum XAR</comment> <comment xml:lang="pt">Pacote XAR</comment> + <comment xml:lang="pt_BR">Arquivo XAR</comment> <comment xml:lang="sk">XAR archív</comment> <comment xml:lang="sl">Arhiv XAR</comment> <comment xml:lang="sr">КСАР архива</comment> @@ -51,12 +55,14 @@ <comment xml:lang="ca">Arxiu tar (comprimit amb LZ4)</comment> <comment xml:lang="ca@valencia">Arxiu tar (comprimit amb LZ4)</comment> <comment xml:lang="cs">Archiv Tar (komprimovaný LZ4)</comment> + <comment xml:lang="de">Tar-Archiv (LZ4-komprimiert)</comment> <comment xml:lang="en_GB">Tar archive (LZ4-compressed)</comment> <comment xml:lang="es">Archivo comprimido Tar (comprimido con LZ4)</comment> <comment xml:lang="et">Tar-arhiiv (LZ4 tihendusega)</comment> <comment xml:lang="nl">Tar-archief (lz4-gecomprimeerd)</comment> <comment xml:lang="pl">Archiwum Tar (kompresja LZ4)</comment> <comment xml:lang="pt">Pacote TAR (comprimido com LZ4)</comment> + <comment xml:lang="pt_BR">Arquivo tar (compressão LZ4)</comment> <comment xml:lang="sk">Tar archív (LZ4 komprimovaný)</comment> <comment xml:lang="sl">Arhiv tar (stisnjen z LZ4)</comment> <comment xml:lang="sr">тар архива (ЛЗ4‑компресована)</comment> @@ -71,6 +77,7 @@ <comment>AppImage application bundle</comment> <comment xml:lang="ca">Paquet d'aplicació «AppImage»</comment> <comment xml:lang="ca@valencia">Paquet d'aplicació «AppImage»</comment> + <comment xml:lang="de">AppImage-Anwendungspaket</comment> <comment xml:lang="en_GB">AppImage application bundle</comment> <comment xml:lang="es">Paquete de aplicación AppImage</comment> <comment xml:lang="et">AppImage rakendusekimp</comment> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/kerfuffle/pluginmanager.cpp new/ark-16.08.2/kerfuffle/pluginmanager.cpp --- old/ark-16.08.1/kerfuffle/pluginmanager.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/kerfuffle/pluginmanager.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -199,7 +199,9 @@ // Initialize the QMap to sort by comment. foreach (const QString &mimeType, mimeTypes) { QMimeType mime(QMimeDatabase().mimeTypeForName(mimeType)); - map[mime.comment().toLower()] = mime.name(); + if (mime.isValid()) { + map[mime.comment().toLower()] = mime.name(); + } } // Convert to sorted QStringList. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/part/archivemodel.cpp new/ark-16.08.2/part/archivemodel.cpp --- old/ark-16.08.1/part/archivemodel.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/part/archivemodel.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -679,7 +679,7 @@ if (!node) { ArchiveEntry e; e[ FileName ] = (parent == m_rootNode) ? - piece : parent->entry()[ FileName ].toString() + QLatin1Char( '/' ) + piece; + piece + QLatin1Char('/') : parent->entry()[FileName].toString() + piece + QLatin1Char('/'); e[ InternalID ] = e.value(FileName); e[ IsDirectory ] = true; node = new ArchiveDirNode(parent, e); @@ -805,6 +805,14 @@ } entry[FileName] = entryFileName; + // For some archive formats (e.g. AppImage and RPM) paths of folders do not + // contain a trailing slash, so we append it. + if (entry[IsDirectory].toBool() && !entry[FileName].toString().endsWith(QLatin1Char('/'))) { + entry[FileName] = entry[FileName].toString() + QLatin1Char('/'); + entry[InternalID] = entry[FileName]; + qCDebug(ARK) << "Trailing slash appended to entry:" << entry[FileName]; + } + /// 1. Skip already created nodes if (m_rootNode) { ArchiveNode *existing = m_rootNode->findByPath(entry[ FileName ].toString().split(QLatin1Char( '/' ))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/part/archiveview.cpp new/ark-16.08.2/part/archiveview.cpp --- old/ark-16.08.1/part/archiveview.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/part/archiveview.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -33,23 +33,17 @@ ArchiveView::ArchiveView(QWidget *parent) : QTreeView(parent) { -} - -void ArchiveView::setModel(QAbstractItemModel *model) -{ - QTreeView::setModel(model); setSelectionMode(QAbstractItemView::ExtendedSelection); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setAlternatingRowColors(true); setAnimated(true); setAllColumnsShowFocus(true); setSortingEnabled(true); - - //drag and drop setDragEnabled(true); - setAcceptDrops(true); setDropIndicatorShown(true); - setDragDropMode(QAbstractItemView::DragDrop); + // #368807: drops must be initially disabled, otherwise they will override the MainWindow's ones. + // They will be enabled in Part::slotLoadingFinished(). + setDropsEnabled(false); } void ArchiveView::startDrag(Qt::DropActions supportedActions) @@ -63,6 +57,11 @@ QTreeView::startDrag(supportedActions); } +void ArchiveView::setDropsEnabled(bool enabled) +{ + setAcceptDrops(enabled); + setDragDropMode(enabled ? QAbstractItemView::DragDrop : QAbstractItemView::NoDragDrop); +} void ArchiveView::dragEnterEvent(QDragEnterEvent * event) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/part/archiveview.h new/ark-16.08.2/part/archiveview.h --- old/ark-16.08.1/part/archiveview.h 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/part/archiveview.h 2016-10-10 14:25:46.000000000 +0200 @@ -35,7 +35,10 @@ virtual void dragMoveEvent(class QDragMoveEvent * event) Q_DECL_OVERRIDE; virtual void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE; - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + /** + * Set whether the view should accept drop events. + */ + void setDropsEnabled(bool enabled); }; #endif /* ARCHIVEVIEW_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/part/arkviewer.cpp new/ark-16.08.2/part/arkviewer.cpp --- old/ark-16.08.1/part/arkviewer.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/part/arkviewer.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -30,10 +30,11 @@ #include <KSharedConfig> #include <KWindowConfig> -#include <QProgressDialog> #include <QDebug> #include <QFile> #include <QMimeDatabase> +#include <QProgressDialog> +#include <QPushButton> ArkViewer::ArkViewer() : QDialog() @@ -44,6 +45,9 @@ setupUi(this); + // Bug 369390: This prevents the Enter key from closing the dialog. + m_buttonBox->button(QDialogButtonBox::Close)->setAutoDefault(false); + connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(this, &ArkViewer::finished, this, &ArkViewer::dialogClosed); } @@ -204,6 +208,7 @@ layout()->replaceWidget(m_partPlaceholder, m_part.data()->widget()); m_part.data()->openUrl(QUrl::fromLocalFile(fileName)); + m_part.data()->widget()->setFocus(); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/part/part.cpp new/ark-16.08.2/part/part.cpp --- old/ark-16.08.1/part/part.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/part/part.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -287,8 +287,6 @@ m_view->setModel(m_model); - m_view->setSortingEnabled(true); - connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged, this, &Part::updateActions); connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged, @@ -676,14 +674,11 @@ job->start(); } else { updateActions(); + m_view->setDropsEnabled(true); } m_infoPanel->setIndex(QModelIndex()); - if (arguments().metaData()[QStringLiteral("showExtractDialog")] == QLatin1String("true")) { - QTimer::singleShot(0, this, &Part::slotShowExtractionDialog); - } - const QString password = arguments().metaData()[QStringLiteral("encryptionPassword")]; if (!password.isEmpty()) { m_model->encryptArchive(password, @@ -810,6 +805,8 @@ // After loading all files, resize the columns to fit all fields m_view->header()->resizeSections(QHeaderView::ResizeToContents); + // Now we can start accepting drops in the archive view. + m_view->setDropsEnabled(true); updateActions(); @@ -835,6 +832,10 @@ displayMsgWidget(KMessageWidget::Warning, xi18nc("@info", "Ark does not currently support ISO files with UDF filesystem.")); } } + + if (arguments().metaData()[QStringLiteral("showExtractDialog")] == QLatin1String("true")) { + QTimer::singleShot(0, this, &Part::slotShowExtractionDialog); + } } void Part::setReadyGui() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/part/part.h new/ark-16.08.2/part/part.h --- old/ark-16.08.1/part/part.h 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/part/part.h 2016-10-10 14:25:46.000000000 +0200 @@ -33,6 +33,7 @@ #include <QModelIndex> class ArchiveModel; +class ArchiveView; class InfoPanel; class KAboutData; @@ -145,7 +146,7 @@ void registerJob(KJob *job); ArchiveModel *m_model; - QTreeView *m_view; + ArchiveView *m_view; QAction *m_previewAction; QAction *m_openFileAction; QAction *m_openFileWithAction; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/cli7zplugin/kerfuffle_cli7z.json.cmake new/ark-16.08.2/plugins/cli7zplugin/kerfuffle_cli7z.json.cmake --- old/ark-16.08.1/plugins/cli7zplugin/kerfuffle_cli7z.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/cli7zplugin/kerfuffle_cli7z.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,61 +1,65 @@ { "KPlugin": { - "Id": "kerfuffle_cli7z", + "Id": "kerfuffle_cli7z", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "7zip archive plugin", - "Name[ca@valencia]": "Connector per arxius 7zip", - "Name[ca]": "Connector per arxius 7zip", - "Name[cs]": "Modul pro archiv 7zip", - "Name[de]": "7zip-Archiv-Modul", - "Name[es]": "Complemento de archivo 7zip", - "Name[fi]": "7zip-pakkaustuki", - "Name[it]": "Estensione per archivi 7zip", - "Name[nb]": "Programtillegg for 7zip-arkiv", - "Name[nl]": "7zip-archiefplug-in", - "Name[nn]": "7zip-arkivtillegg", - "Name[pl]": "Wtyczka archiwów 7zip", - "Name[pt]": "'Plugin' de pacotes 7zip", - "Name[pt_BR]": "Plugin de arquivos 7zip", - "Name[ru]": "Поддержка архивов 7zip", - "Name[sk]": "Modul 7zip archívu", - "Name[sl]": "Vstavek za arhive 7zip", - "Name[sr@ijekavian]": "Прикључак 7зип архива", - "Name[sr@ijekavianlatin]": "Priključak 7zip arhiva", - "Name[sr@latin]": "Priključak 7zip arhiva", - "Name[sr]": "Прикључак 7зип архива", - "Name[sv]": "Insticksprogram för 7zip-arkiv", - "Name[uk]": "Додаток для архівів 7zip", - "Name[x-test]": "xx7zip archive pluginxx", - "Name[zh_CN]": "7zip 归档插件", + ], + "Name": "7zip archive plugin", + "Name[ca@valencia]": "Connector per arxius 7zip", + "Name[ca]": "Connector per arxius 7zip", + "Name[cs]": "Modul pro archiv 7zip", + "Name[de]": "7zip-Archiv-Modul", + "Name[es]": "Complemento de archivo 7zip", + "Name[et]": "7zip arhiivi plugin", + "Name[fi]": "7zip-pakkaustuki", + "Name[fr]": "Module externe d'archive « 7zip »", + "Name[gl]": "Complemento de arquivo de 7zip", + "Name[he]": "תוסף ארכיוני 7zip", + "Name[it]": "Estensione per archivi 7zip", + "Name[nb]": "Programtillegg for 7zip-arkiv", + "Name[nl]": "7zip-archiefplug-in", + "Name[nn]": "7zip-arkivtillegg", + "Name[pl]": "Wtyczka archiwów 7zip", + "Name[pt]": "'Plugin' de pacotes 7zip", + "Name[pt_BR]": "Plugin de arquivos 7zip", + "Name[ru]": "Поддержка архивов 7zip", + "Name[sk]": "Modul 7zip archívu", + "Name[sl]": "Vstavek za arhive 7zip", + "Name[sr@ijekavian]": "Прикључак 7зип архива", + "Name[sr@ijekavianlatin]": "Priključak 7zip arhiva", + "Name[sr@latin]": "Priključak 7zip arhiva", + "Name[sr]": "Прикључак 7зип архива", + "Name[sv]": "Insticksprogram för 7zip-arkiv", + "Name[uk]": "Додаток для архівів 7zip", + "Name[x-test]": "xx7zip archive pluginxx", + "Name[zh_CN]": "7zip 归档插件", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Kerfuffle-ReadOnlyExecutables": [ "7z" - ], - "X-KDE-Kerfuffle-ReadWrite": true, + ], + "X-KDE-Kerfuffle-ReadWrite": true, "X-KDE-Kerfuffle-ReadWriteExecutables": [ "7z" - ], - "X-KDE-Priority": 180, + ], + "X-KDE-Priority": 180, "application/x-7z-compressed": { - "CompressionLevelDefault": 5, - "CompressionLevelMax": 9, - "CompressionLevelMin": 0, - "SupportsTesting": true, - "HeaderEncryption": true, - "SupportsMultiVolume": true - }, + "CompressionLevelDefault": 5, + "CompressionLevelMax": 9, + "CompressionLevelMin": 0, + "HeaderEncryption": true, + "SupportsMultiVolume": true, + "SupportsTesting": true + }, "application/zip": { - "CompressionLevelDefault": 5, - "CompressionLevelMax": 9, - "CompressionLevelMin": 0, - "SupportsTesting": true, - "Encryption": true, - "SupportsMultiVolume": true + "CompressionLevelDefault": 5, + "CompressionLevelMax": 9, + "CompressionLevelMin": 0, + "Encryption": true, + "SupportsMultiVolume": true, + "SupportsTesting": true } -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/clirarplugin/CMakeLists.txt new/ark-16.08.2/plugins/clirarplugin/CMakeLists.txt --- old/ark-16.08.1/plugins/clirarplugin/CMakeLists.txt 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/clirarplugin/CMakeLists.txt 2016-10-10 14:25:46.000000000 +0200 @@ -1,6 +1,7 @@ ########### next target ############### -set(SUPPORTED_CLIRAR_MIMETYPES "application/x-rar;") +# TODO: drop application/x-rar alias once distributions ship shared-mime-info 1.7 +set(SUPPORTED_CLIRAR_MIMETYPES "application/vnd.rar;application/x-rar;") set(kerfuffle_clirar_SRCS cliplugin.cpp) @@ -9,7 +10,11 @@ IDENTIFIER ARK CATEGORY_NAME ark.clirar) -set(SUPPORTED_MIMETYPES "application/x-rar") +# NOTE: the first double-quotes of the first mime and the last +# double-quotes of the last mime must NOT be escaped. +set(SUPPORTED_MIMETYPES + "application/vnd.rar\", + \"application/x-rar") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_clirar.json.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/clirarplugin/kerfuffle_clirar.json.cmake new/ark-16.08.2/plugins/clirarplugin/kerfuffle_clirar.json.cmake --- old/ark-16.08.1/plugins/clirarplugin/kerfuffle_clirar.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/clirarplugin/kerfuffle_clirar.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,57 +1,68 @@ { "KPlugin": { - "Id": "kerfuffle_clirar", + "Id": "kerfuffle_clirar", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "RAR archive plugin", - "Name[ca@valencia]": "Connector per arxius RAR", - "Name[ca]": "Connector per arxius RAR", - "Name[cs]": "Modul pro archiv RAR", - "Name[de]": "RAR-Archiv-Modul", - "Name[en_GB]": "RAR archive plugin", - "Name[es]": "Complemento de archivo RAR", - "Name[fi]": "RAR-pakkaustuki", - "Name[fr]": "Module externe d'archive « RAR »", - "Name[it]": "Estensione per archivi RAR", - "Name[nb]": "Programtillegg for RAR-arkiv", - "Name[nl]": "RAR-archiefplug-in", - "Name[nn]": "RAR-arkivtillegg", - "Name[pl]": "Wtyczka archiwów RAR", - "Name[pt]": "'Plugin' de pacotes RAR", - "Name[pt_BR]": "Plugin de arquivos RAR", - "Name[ru]": "Поддержка архивов RAR", - "Name[sk]": "Modul RAR archívu", - "Name[sl]": "Vstavek za arhive RAR", - "Name[sr@ijekavian]": "Прикључак РАР архива", - "Name[sr@ijekavianlatin]": "Priključak RAR arhiva", - "Name[sr@latin]": "Priključak RAR arhiva", - "Name[sr]": "Прикључак РАР архива", - "Name[sv]": "Insticksprogram för RAR-arkiv", - "Name[uk]": "Додаток для архівів RAR", - "Name[x-test]": "xxRAR archive pluginxx", - "Name[zh_CN]": "RAR 归档插件", - "Name[zh_TW]": "RAR 壓縮檔外掛程式", + ], + "Name": "RAR archive plugin", + "Name[ca@valencia]": "Connector per arxius RAR", + "Name[ca]": "Connector per arxius RAR", + "Name[cs]": "Modul pro archiv RAR", + "Name[de]": "RAR-Archiv-Modul", + "Name[es]": "Complemento de archivo RAR", + "Name[et]": "RAR-arhiivi plugin", + "Name[fi]": "RAR-pakkaustuki", + "Name[fr]": "Module externe d'archive « RAR »", + "Name[gl]": "Complemento de arquivo RAR", + "Name[he]": "תוסף ארכיוני RAR", + "Name[it]": "Estensione per archivi RAR", + "Name[ja]": "RAR アーカイブ用プラグイン", + "Name[nb]": "Programtillegg for RAR-arkiv", + "Name[nl]": "RAR-archiefplug-in", + "Name[nn]": "RAR-arkivtillegg", + "Name[pl]": "Wtyczka archiwów RAR", + "Name[pt]": "'Plugin' de pacotes RAR", + "Name[pt_BR]": "Plugin de arquivos RAR", + "Name[ru]": "Поддержка архивов RAR", + "Name[sk]": "Modul RAR archívu", + "Name[sl]": "Vstavek za arhive RAR", + "Name[sr@ijekavian]": "Прикључак РАР архива", + "Name[sr@ijekavianlatin]": "Priključak RAR arhiva", + "Name[sr@latin]": "Priključak RAR arhiva", + "Name[sr]": "Прикључак РАР архива", + "Name[sv]": "Insticksprogram för RAR-arkiv", + "Name[uk]": "Додаток для архівів RAR", + "Name[x-test]": "xxRAR archive pluginxx", + "Name[zh_CN]": "RAR 归档插件", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Kerfuffle-ReadOnlyExecutables": [ "unrar" - ], - "X-KDE-Kerfuffle-ReadWrite": true, + ], + "X-KDE-Kerfuffle-ReadWrite": true, "X-KDE-Kerfuffle-ReadWriteExecutables": [ "rar" - ], - "X-KDE-Priority": 120, + ], + "X-KDE-Priority": 120, + "application/vnd.rar": { + "CompressionLevelDefault": 3, + "CompressionLevelMax": 5, + "CompressionLevelMin": 0, + "HeaderEncryption": true, + "SupportsMultiVolume": true, + "SupportsTesting": true, + "SupportsWriteComment": true + }, "application/x-rar": { - "CompressionLevelDefault": 3, - "CompressionLevelMax": 5, - "CompressionLevelMin": 0, - "SupportsWriteComment": true, - "SupportsTesting": true, - "HeaderEncryption": true, - "SupportsMultiVolume": true + "CompressionLevelDefault": 3, + "CompressionLevelMax": 5, + "CompressionLevelMin": 0, + "HeaderEncryption": true, + "SupportsMultiVolume": true, + "SupportsTesting": true, + "SupportsWriteComment": true } -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/cliunarchiverplugin/CMakeLists.txt new/ark-16.08.2/plugins/cliunarchiverplugin/CMakeLists.txt --- old/ark-16.08.1/plugins/cliunarchiverplugin/CMakeLists.txt 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/cliunarchiverplugin/CMakeLists.txt 2016-10-10 14:25:46.000000000 +0200 @@ -1,6 +1,7 @@ ########### next target ############### -set(SUPPORTED_CLIUNARCHIVER_MIMETYPES "application/x-rar;") +# TODO: drop application/x-rar alias once distributions ship shared-mime-info 1.7 +set(SUPPORTED_CLIUNARCHIVER_MIMETYPES "application/vnd.rar;application/x-rar;") set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp) @@ -9,7 +10,11 @@ IDENTIFIER ARK CATEGORY_NAME ark.cliunarchiver) -set(SUPPORTED_MIMETYPES "application/x-rar") +# NOTE: the first double-quotes of the first mime and the last +# double-quotes of the last mime must NOT be escaped. +set(SUPPORTED_MIMETYPES + "application/vnd.rar\", + \"application/x-rar") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_cliunarchiver.json.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json.cmake new/ark-16.08.2/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json.cmake --- old/ark-16.08.1/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,42 +1,44 @@ { "KPlugin": { - "Id": "kerfuffle_cliunarchiver", + "Id": "kerfuffle_cliunarchiver", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "The Unarchiver plugin", - "Name[ca@valencia]": "Connector de l'Unarchiver", - "Name[ca]": "Connector de l'Unarchiver", - "Name[cs]": "Modul pro Unarchiver", - "Name[de]": "Unarchiver-Modul", - "Name[en_GB]": "The Unarchiver plugin", - "Name[es]": "El complemento de Unarchiver", - "Name[fi]": "Unarchiver-tuki", - "Name[it]": "Estensione The Unarchiver", - "Name[nl]": "De plug-in voor uit archief halen", - "Name[pl]": "Wtyczka wypakowywacza", - "Name[pt]": "O 'plugin' do Unarchiver", - "Name[pt_BR]": "Plugin Unarchiver", - "Name[sk]": "Plugin Unarchiver", - "Name[sl]": "Vstavek Unarchiver", - "Name[sr@ijekavian]": "Прикључак Унархивера", - "Name[sr@ijekavianlatin]": "Priključak Unarchivera", - "Name[sr@latin]": "Priključak Unarchivera", - "Name[sr]": "Прикључак Унархивера", - "Name[sv]": "Insticksprogram för Unarchiver", - "Name[uk]": "Додаток Unarchiver", - "Name[x-test]": "xxThe Unarchiver pluginxx", - "Name[zh_CN]": "Unarchiver 插件", - "Name[zh_TW]": "解壓縮外掛程式", + ], + "Name": "The Unarchiver plugin", + "Name[ca@valencia]": "Connector de l'Unarchiver", + "Name[ca]": "Connector de l'Unarchiver", + "Name[cs]": "Modul pro Unarchiver", + "Name[de]": "Unarchiver-Modul", + "Name[es]": "El complemento de Unarchiver", + "Name[et]": "Unarchiveri plugin", + "Name[fi]": "Unarchiver-tuki", + "Name[fr]": "Module externe d'extraction d'archive", + "Name[gl]": "Complemento de desarquivar", + "Name[he]": "תוסף חילוץ אכיונים", + "Name[it]": "Estensione The Unarchiver", + "Name[nl]": "De plug-in voor uit archief halen", + "Name[pl]": "Wtyczka wypakowywacza", + "Name[pt]": "O 'plugin' do Unarchiver", + "Name[pt_BR]": "Plugin Unarchiver", + "Name[sk]": "Plugin Unarchiver", + "Name[sl]": "Vstavek Unarchiver", + "Name[sr@ijekavian]": "Прикључак Унархивера", + "Name[sr@ijekavianlatin]": "Priključak Unarchivera", + "Name[sr@latin]": "Priključak Unarchivera", + "Name[sr]": "Прикључак Унархивера", + "Name[sv]": "Insticksprogram för Unarchiver", + "Name[uk]": "Додаток Unarchiver", + "Name[x-test]": "xxThe Unarchiver pluginxx", + "Name[zh_CN]": "Unarchiver 插件", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Kerfuffle-ReadOnlyExecutables": [ - "lsar", + "lsar", "unar" - ], - "X-KDE-Kerfuffle-ReadWrite": false, + ], + "X-KDE-Kerfuffle-ReadWrite": false, "X-KDE-Priority": 100 -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/clizipplugin/cliplugin.cpp new/ark-16.08.2/plugins/clizipplugin/cliplugin.cpp --- old/ark-16.08.1/plugins/clizipplugin/cliplugin.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/clizipplugin/cliplugin.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -118,7 +118,7 @@ p[PasswordPromptPattern] = QStringLiteral(" password: "); p[WrongPasswordPatterns] = QStringList() << QStringLiteral("incorrect password"); - //p[ExtractionFailedPatterns] = QStringList() << "CRC failed"; + p[ExtractionFailedPatterns] = QStringList() << QStringLiteral("unsupported compression method"); p[CorruptArchivePatterns] = QStringList() << QStringLiteral("End-of-central-directory signature not found"); p[DiskFullPatterns] = QStringList() << QStringLiteral("write error \\(disk full\\?\\)") << QStringLiteral("No space left on device"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/clizipplugin/kerfuffle_clizip.json.cmake new/ark-16.08.2/plugins/clizipplugin/kerfuffle_clizip.json.cmake --- old/ark-16.08.1/plugins/clizipplugin/kerfuffle_clizip.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/clizipplugin/kerfuffle_clizip.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,60 +1,64 @@ { "KPlugin": { - "Id": "kerfuffle_clizip", + "Id": "kerfuffle_clizip", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "ZIP archive plugin", - "Name[ca@valencia]": "Connector per arxius ZIP", - "Name[ca]": "Connector per arxius ZIP", - "Name[cs]": "Modul pro archiv ZIP", - "Name[de]": "ZIP-Archiv-Modul", - "Name[es]": "Complemento de archivo ZIP", - "Name[fi]": "ZIP-pakkaustuki", - "Name[it]": "Estensione per archivi ZIP", - "Name[nb]": "Programtillegg for ZIP-arkiv", - "Name[nl]": "ZIP-archiefplug-in", - "Name[nn]": "ZIP-arkivtillegg", - "Name[pl]": "Wtyczka archiwów ZIP", - "Name[pt]": "'Plugin' de pacotes ZIP", - "Name[pt_BR]": "Plugin de arquivos ZIP", - "Name[ru]": "Поддержка архивов ZIP", - "Name[sk]": "Modul ZIP archívu", - "Name[sl]": "Vstavek za arhive ZIP", - "Name[sr@ijekavian]": "Прикључак ЗИП архива", - "Name[sr@ijekavianlatin]": "Priključak ZIP arhiva", - "Name[sr@latin]": "Priključak ZIP arhiva", - "Name[sr]": "Прикључак ЗИП архива", - "Name[sv]": "Insticksprogram för ZIP-arkiv", - "Name[uk]": "Додаток для архівів ZIP", - "Name[x-test]": "xxZIP archive pluginxx", - "Name[zh_CN]": "ZIP 归档插件", + ], + "Name": "ZIP archive plugin", + "Name[ca@valencia]": "Connector per arxius ZIP", + "Name[ca]": "Connector per arxius ZIP", + "Name[cs]": "Modul pro archiv ZIP", + "Name[de]": "ZIP-Archiv-Modul", + "Name[es]": "Complemento de archivo ZIP", + "Name[et]": "ZIP-arhiivi plugin", + "Name[fi]": "ZIP-pakkaustuki", + "Name[fr]": "Module externe d'archive « zip »", + "Name[gl]": "Complemento de arquivo ZIP", + "Name[he]": "תוסף ארכיוני ZIP", + "Name[it]": "Estensione per archivi ZIP", + "Name[nb]": "Programtillegg for ZIP-arkiv", + "Name[nl]": "ZIP-archiefplug-in", + "Name[nn]": "ZIP-arkivtillegg", + "Name[pl]": "Wtyczka archiwów ZIP", + "Name[pt]": "'Plugin' de pacotes ZIP", + "Name[pt_BR]": "Plugin de arquivos ZIP", + "Name[ru]": "Поддержка архивов ZIP", + "Name[sk]": "Modul ZIP archívu", + "Name[sl]": "Vstavek za arhive ZIP", + "Name[sr@ijekavian]": "Прикључак ЗИП архива", + "Name[sr@ijekavianlatin]": "Priključak ZIP arhiva", + "Name[sr@latin]": "Priključak ZIP arhiva", + "Name[sr]": "Прикључак ЗИП архива", + "Name[sv]": "Insticksprogram för ZIP-arkiv", + "Name[uk]": "Додаток для архівів ZIP", + "Name[x-test]": "xxZIP archive pluginxx", + "Name[zh_CN]": "ZIP 归档插件", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Kerfuffle-ReadOnlyExecutables": [ - "zipinfo", + "zipinfo", "unzip" - ], - "X-KDE-Kerfuffle-ReadWrite": true, + ], + "X-KDE-Kerfuffle-ReadWrite": true, "X-KDE-Kerfuffle-ReadWriteExecutables": [ "zip" - ], - "X-KDE-Priority": 160, + ], + "X-KDE-Priority": 160, "application/x-java-archive": { - "CompressionLevelDefault": 6, - "CompressionLevelMax": 9, - "CompressionLevelMin": 0, - "SupportsTesting": true, - "Encryption": true - }, + "CompressionLevelDefault": 6, + "CompressionLevelMax": 9, + "CompressionLevelMin": 0, + "Encryption": true, + "SupportsTesting": true + }, "application/zip": { - "CompressionLevelDefault": 6, - "CompressionLevelMax": 9, - "CompressionLevelMin": 0, - "SupportsTesting": true, - "Encryption": true + "CompressionLevelDefault": 6, + "CompressionLevelMax": 9, + "CompressionLevelMin": 0, + "Encryption": true, + "SupportsTesting": true } -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/libarchive/kerfuffle_libarchive.json.cmake new/ark-16.08.2/plugins/libarchive/kerfuffle_libarchive.json.cmake --- old/ark-16.08.1/plugins/libarchive/kerfuffle_libarchive.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/libarchive/kerfuffle_libarchive.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,79 +1,83 @@ { "KPlugin": { - "Description": "LibArchive Plugin for Kerfuffle", - "Description[ca@valencia]": "Connector del LibArchive pel Kerfuffle", - "Description[ca]": "Connector del LibArchive pel Kerfuffle", - "Description[cs]": "LibArchive modul pro Kerfuffle", - "Description[de]": "LibArchive-Modul für Kerfuffle", - "Description[es]": "Complemento LibArchive para Kerfuffle", - "Description[fi]": "LibArchive-pakkaustuki", - "Description[it]": "Estensione LibArchive per Kerfuffle", - "Description[nl]": "LibArchive plug-in voor Kerfuffle", - "Description[pl]": "Wtyczka LibArchive dla Kerfuffle", - "Description[pt]": "'Plugin' da LibArchive para o Kerfuffle", - "Description[pt_BR]": "Plugin LibArchive para a Kerfuffle", - "Description[sk]": "LibArchive modul pre Kerfuffle", - "Description[sl]": "Vstavek LibArchive za Kerfuffle", - "Description[sr@ijekavian]": "Прикључак Либархива за Керфафл", - "Description[sr@ijekavianlatin]": "Priključak libarchivea za Kerfuffle", - "Description[sr@latin]": "Priključak libarchivea za Kerfuffle", - "Description[sr]": "Прикључак Либархива за Керфафл", - "Description[sv]": "LibArchive-insticksprogram för Kerfuffle", - "Description[uk]": "Додаток LibArchive для Kerfuffle", - "Description[x-test]": "xxLibArchive Plugin for Kerfufflexx", - "Description[zh_CN]": "Kerfuffle 的 LibArchive 插件", - "Id": "kerfuffle_libarchive", + "Description": "LibArchive Plugin for Kerfuffle", + "Description[ca@valencia]": "Connector del LibArchive pel Kerfuffle", + "Description[ca]": "Connector del LibArchive pel Kerfuffle", + "Description[cs]": "LibArchive modul pro Kerfuffle", + "Description[de]": "LibArchive-Modul für Kerfuffle", + "Description[es]": "Complemento LibArchive para Kerfuffle", + "Description[et]": "Kerfuffle'i LibArchive plugin", + "Description[fi]": "LibArchive-pakkaustuki", + "Description[fr]": "Module externe pour Kerfuffle", + "Description[gl]": "Complemento de libarchive para Kerfuffle", + "Description[it]": "Estensione LibArchive per Kerfuffle", + "Description[nl]": "LibArchive plug-in voor Kerfuffle", + "Description[pl]": "Wtyczka LibArchive dla Kerfuffle", + "Description[pt]": "'Plugin' da LibArchive para o Kerfuffle", + "Description[pt_BR]": "Plugin LibArchive para a Kerfuffle", + "Description[ru]": "Модуль LibArchive для Kerfuffle", + "Description[sk]": "LibArchive modul pre Kerfuffle", + "Description[sl]": "Vstavek LibArchive za Kerfuffle", + "Description[sr@ijekavian]": "Прикључак Либархива за Керфафл", + "Description[sr@ijekavianlatin]": "Priključak libarchivea za Kerfuffle", + "Description[sr@latin]": "Priključak libarchivea za Kerfuffle", + "Description[sr]": "Прикључак Либархива за Керфафл", + "Description[sv]": "LibArchive-insticksprogram för Kerfuffle", + "Description[uk]": "Додаток LibArchive для Kerfuffle", + "Description[x-test]": "xxLibArchive Plugin for Kerfufflexx", + "Description[zh_CN]": "Kerfuffle 的 LibArchive 插件", + "Id": "kerfuffle_libarchive", "MimeTypes": [ "@SUPPORTED_READWRITE_MIMETYPES@" - ], - "Name": "kerfuffle_libarchive", - "Name[sv]": "Kerfuffle LibArchive", - "Name[x-test]": "xxkerfuffle_libarchivexx", + ], + "Name": "kerfuffle_libarchive", + "Name[sv]": "Kerfuffle LibArchive", + "Name[x-test]": "xxkerfuffle_libarchivexx", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, - "X-KDE-Kerfuffle-ReadWrite": true, - "X-KDE-Priority": 100, + }, + "X-KDE-Kerfuffle-ReadWrite": true, + "X-KDE-Priority": 100, "application/x-bzip-compressed-tar": { - "CompressionLevelDefault": 9, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 9, + "CompressionLevelMax": 9, "CompressionLevelMin": 1 - }, + }, "application/x-compressed-tar": { - "CompressionLevelDefault": 6, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 6, + "CompressionLevelMax": 9, "CompressionLevelMin": 1 - }, + }, "application/x-lrzip-compressed-tar": { - "CompressionLevelDefault": 1, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 1, + "CompressionLevelMax": 9, "CompressionLevelMin": 1 - }, + }, + "application/x-lz4-compressed-tar": { + "CompressionLevelDefault": 1, + "CompressionLevelMax": 9, + "CompressionLevelMin": 1 + }, "application/x-lzip-compressed-tar": { - "CompressionLevelDefault": 6, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 6, + "CompressionLevelMax": 9, "CompressionLevelMin": 0 - }, + }, "application/x-lzma-compressed-tar": { - "CompressionLevelDefault": 6, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 6, + "CompressionLevelMax": 9, "CompressionLevelMin": 0 - }, + }, "application/x-tzo": { - "CompressionLevelDefault": 5, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 5, + "CompressionLevelMax": 9, "CompressionLevelMin": 1 - }, + }, "application/x-xz-compressed-tar": { - "CompressionLevelDefault": 6, - "CompressionLevelMax": 9, + "CompressionLevelDefault": 6, + "CompressionLevelMax": 9, "CompressionLevelMin": 0 - }, - "application/x-lz4-compressed-tar": { - "CompressionLevelDefault": 1, - "CompressionLevelMax": 9, - "CompressionLevelMin": 1 } -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake new/ark-16.08.2/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake --- old/ark-16.08.1/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/libarchive/kerfuffle_libarchive_readonly.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,17 +1,17 @@ { "KPlugin": { - "Id": "kerfuffle_libarchive_readonly", + "Id": "kerfuffle_libarchive_readonly", "MimeTypes": [ "@SUPPORTED_READONLY_MIMETYPES@" - ], - "Name": "kerfuffle_libarchive_readonly", - "Name[sv]": "Kerfuffle LibArchive skrivskyddat", - "Name[x-test]": "xxkerfuffle_libarchive_readonlyxx", + ], + "Name": "kerfuffle_libarchive_readonly", + "Name[sv]": "Kerfuffle LibArchive skrivskyddat", + "Name[x-test]": "xxkerfuffle_libarchive_readonlyxx", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, - "X-KDE-Kerfuffle-ReadWrite": false, + }, + "X-KDE-Kerfuffle-ReadWrite": false, "X-KDE-Priority": 100 -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/libarchive/libarchiveplugin.cpp new/ark-16.08.2/plugins/libarchive/libarchiveplugin.cpp --- old/ark-16.08.1/plugins/libarchive/libarchiveplugin.cpp 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/libarchive/libarchiveplugin.cpp 2016-10-10 14:25:46.000000000 +0200 @@ -104,12 +104,13 @@ m_cachedArchiveEntryCount++; archive_read_data_skip(arch_reader.data()); } - m_abortOperation = false; if (result != ARCHIVE_EOF) { - const QString errorString = QLatin1String(archive_error_string(arch_reader.data())); - // FIXME: what about the other archive_error_string() calls? Do they also happen to return empty strings? - emit error(errorString.isEmpty() ? i18nc("@info", "Could not read until the end of the archive") : errorString); + if (!m_abortOperation) { + const QString errorString = QLatin1String(archive_error_string(arch_reader.data())); + // FIXME: what about the other archive_error_string() calls? Do they also happen to return empty strings? + emit error(errorString.isEmpty() ? i18nc("@info", "Could not read until the end of the archive") : errorString); + } return false; } @@ -285,14 +286,13 @@ entryFI = QFileInfo(fileWithoutPath); // OR, if the file has a rootNode attached, remove it from file path. - } else if (!extractAll && removeRootNode && entryName != fileBeingRenamed && - !files.at(index).value<fileRootNodePair>().rootNode.isEmpty()) { - - //qCDebug(ARK) << "Removing" << files.at(index).value<fileRootNodePair>().rootNode << "from" << entryName; - - const QString truncatedFilename(entryName.remove(0, files.at(index).value<fileRootNodePair>().rootNode.size())); - archive_entry_copy_pathname(entry, QFile::encodeName(truncatedFilename).constData()); - entryFI = QFileInfo(truncatedFilename); + } else if (!extractAll && removeRootNode && entryName != fileBeingRenamed) { + const QString rootNode = files.at(index).value<fileRootNodePair>().rootNode; + if (!rootNode.isEmpty()) { + const QString truncatedFilename = entryName.remove(entryName.indexOf(rootNode), rootNode.size()); + archive_entry_copy_pathname(entry, QFile::encodeName(truncatedFilename).constData()); + entryFI = QFileInfo(truncatedFilename); + } } // Check if the file about to be written already exists. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/libsinglefileplugin/kerfuffle_libbz2.json.cmake new/ark-16.08.2/plugins/libsinglefileplugin/kerfuffle_libbz2.json.cmake --- old/ark-16.08.1/plugins/libsinglefileplugin/kerfuffle_libbz2.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/libsinglefileplugin/kerfuffle_libbz2.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,41 +1,42 @@ { "KPlugin": { - "Description": "libbz2 plugin for Kerfuffle", - "Description[ca@valencia]": "Connector del libbz2 pel Kerfuffle", - "Description[ca]": "Connector del libbz2 pel Kerfuffle", - "Description[cs]": "modul libbz2 pro Kerfuffle", - "Description[de]": "libgz2-Modul für Kerfuffle", - "Description[en_GB]": "libbz2 plugin for Kerfuffle", - "Description[es]": "Complemento libbz2 para Kerfuffle", - "Description[fi]": "libbz2-pakkaustuki", - "Description[it]": "Estensione libbz2 per Kerfuffle", - "Description[nl]": "libbz2 plug-in voor Kerfuffle", - "Description[pl]": "wtyczka libbz2 dla Kerfuffle", - "Description[pt]": "'Plugin' de libbz2 para o Kerfuffle", - "Description[pt_BR]": "Plugin libbz2 para o Kerfuffle", - "Description[ru]": "Модуль libbz2 для Kerfuffle", - "Description[sk]": "libbz2 modul pre Kerfuffle", - "Description[sl]": "Vstavek libbz2 za Kerfuffle", - "Description[sr@ijekavian]": "Прикључак libbz2 за Керфафл", - "Description[sr@ijekavianlatin]": "Priključak libbz2 za Kerfuffle", - "Description[sr@latin]": "Priključak libbz2 za Kerfuffle", - "Description[sr]": "Прикључак libbz2 за Керфафл", - "Description[sv]": "Libbz2-insticksprogram för Kerfuffle", - "Description[uk]": "Додаток libbz2 для Kerfuffle", - "Description[x-test]": "xxlibbz2 plugin for Kerfufflexx", - "Description[zh_CN]": "Kerfuffle 的 libbz2 插件", - "Description[zh_TW]": "Kerfuffle 的 libbz2 外掛程式", - "Id": "kerfuffle_libbz2", + "Description": "libbz2 plugin for Kerfuffle", + "Description[ca@valencia]": "Connector del libbz2 pel Kerfuffle", + "Description[ca]": "Connector del libbz2 pel Kerfuffle", + "Description[cs]": "modul libbz2 pro Kerfuffle", + "Description[de]": "libgz2-Modul für Kerfuffle", + "Description[es]": "Complemento libbz2 para Kerfuffle", + "Description[et]": "Kerfuffle'i libbz2 plugin", + "Description[fi]": "libbz2-pakkaustuki", + "Description[fr]": "Module externe « libbz2 » pour Kerfuffle", + "Description[gl]": "Complemento de libbz2 para Kerfuffle", + "Description[it]": "Estensione libbz2 per Kerfuffle", + "Description[nl]": "libbz2 plug-in voor Kerfuffle", + "Description[pl]": "wtyczka libbz2 dla Kerfuffle", + "Description[pt]": "'Plugin' de libbz2 para o Kerfuffle", + "Description[pt_BR]": "Plugin libbz2 para o Kerfuffle", + "Description[ru]": "Модуль libbz2 для Kerfuffle", + "Description[sk]": "libbz2 modul pre Kerfuffle", + "Description[sl]": "Vstavek libbz2 za Kerfuffle", + "Description[sr@ijekavian]": "Прикључак libbz2 за Керфафл", + "Description[sr@ijekavianlatin]": "Priključak libbz2 za Kerfuffle", + "Description[sr@latin]": "Priključak libbz2 za Kerfuffle", + "Description[sr]": "Прикључак libbz2 за Керфафл", + "Description[sv]": "Libbz2-insticksprogram för Kerfuffle", + "Description[uk]": "Додаток libbz2 для Kerfuffle", + "Description[x-test]": "xxlibbz2 plugin for Kerfufflexx", + "Description[zh_CN]": "Kerfuffle 的 libbz2 插件", + "Id": "kerfuffle_libbz2", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "kerfuffle_libbz2", - "Name[sv]": "Kerfuffle Libbz2", - "Name[x-test]": "xxkerfuffle_libbz2xx", + ], + "Name": "kerfuffle_libbz2", + "Name[sv]": "Kerfuffle Libbz2", + "Name[x-test]": "xxkerfuffle_libbz2xx", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Priority": 100 -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/libsinglefileplugin/kerfuffle_libgz.json.cmake new/ark-16.08.2/plugins/libsinglefileplugin/kerfuffle_libgz.json.cmake --- old/ark-16.08.1/plugins/libsinglefileplugin/kerfuffle_libgz.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/libsinglefileplugin/kerfuffle_libgz.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,41 +1,42 @@ { "KPlugin": { - "Description": "libgz plugin for Kerfuffle", - "Description[ca@valencia]": "Connector del libgz pel Kerfuffle", - "Description[ca]": "Connector del libgz pel Kerfuffle", - "Description[cs]": "modul libgz pro Kerfuffle", - "Description[de]": "libgz-Modul für Kerfuffle", - "Description[en_GB]": "libgz plugin for Kerfuffle", - "Description[es]": "Complemento libgz para Kerfuffle", - "Description[fi]": "libgz-pakkaustuki", - "Description[it]": "Estensione libgz per Kerfuffle", - "Description[nl]": "libgz-plug-in voor Kerfuffle", - "Description[pl]": "wtyczka libgz dla Kerfuffle", - "Description[pt]": "'Plugin' de libgz para o Kerfuffle", - "Description[pt_BR]": "Plugin libgz para a Kerfuffle", - "Description[ru]": "Модуль libgz для Kerfuffle", - "Description[sk]": "libgz modul pre Kerfuffle", - "Description[sl]": "Vstavek libgz za Kerfuffle", - "Description[sr@ijekavian]": "Прикључак libgz за Керфафл", - "Description[sr@ijekavianlatin]": "Priključak libgz za Kerfuffle", - "Description[sr@latin]": "Priključak libgz za Kerfuffle", - "Description[sr]": "Прикључак libgz за Керфафл", - "Description[sv]": "Libgz-insticksprogram för Kerfuffle", - "Description[uk]": "Додаток libgz для Kerfuffle", - "Description[x-test]": "xxlibgz plugin for Kerfufflexx", - "Description[zh_CN]": "Kerfuffle 的 libgz 插件", - "Description[zh_TW]": "Kerfuffle 的 libgz 外掛程式", - "Id": "kerfuffle_libgz", + "Description": "libgz plugin for Kerfuffle", + "Description[ca@valencia]": "Connector del libgz pel Kerfuffle", + "Description[ca]": "Connector del libgz pel Kerfuffle", + "Description[cs]": "modul libgz pro Kerfuffle", + "Description[de]": "libgz-Modul für Kerfuffle", + "Description[es]": "Complemento libgz para Kerfuffle", + "Description[et]": "Kerfuffle'i libgz plugin", + "Description[fi]": "libgz-pakkaustuki", + "Description[fr]": "Module externe « libgz » pour Kerfuffle", + "Description[gl]": "Complemento de libgz para Kerfuffle", + "Description[it]": "Estensione libgz per Kerfuffle", + "Description[nl]": "libgz-plug-in voor Kerfuffle", + "Description[pl]": "wtyczka libgz dla Kerfuffle", + "Description[pt]": "'Plugin' de libgz para o Kerfuffle", + "Description[pt_BR]": "Plugin libgz para a Kerfuffle", + "Description[ru]": "Модуль libgz для Kerfuffle", + "Description[sk]": "libgz modul pre Kerfuffle", + "Description[sl]": "Vstavek libgz za Kerfuffle", + "Description[sr@ijekavian]": "Прикључак libgz за Керфафл", + "Description[sr@ijekavianlatin]": "Priključak libgz za Kerfuffle", + "Description[sr@latin]": "Priključak libgz za Kerfuffle", + "Description[sr]": "Прикључак libgz за Керфафл", + "Description[sv]": "Libgz-insticksprogram för Kerfuffle", + "Description[uk]": "Додаток libgz для Kerfuffle", + "Description[x-test]": "xxlibgz plugin for Kerfufflexx", + "Description[zh_CN]": "Kerfuffle 的 libgz 插件", + "Id": "kerfuffle_libgz", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "kerfuffle_libgz", - "Name[sv]": "Kerfuffle Libgz", - "Name[x-test]": "xxkerfuffle_libgzxx", + ], + "Name": "kerfuffle_libgz", + "Name[sv]": "Kerfuffle Libgz", + "Name[x-test]": "xxkerfuffle_libgzxx", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Priority": 100 -} +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.08.1/plugins/libsinglefileplugin/kerfuffle_libxz.json.cmake new/ark-16.08.2/plugins/libsinglefileplugin/kerfuffle_libxz.json.cmake --- old/ark-16.08.1/plugins/libsinglefileplugin/kerfuffle_libxz.json.cmake 2016-09-05 00:40:54.000000000 +0200 +++ new/ark-16.08.2/plugins/libsinglefileplugin/kerfuffle_libxz.json.cmake 2016-10-10 14:25:46.000000000 +0200 @@ -1,41 +1,42 @@ { "KPlugin": { - "Description": "libxz plugin for Kerfuffle", - "Description[ca@valencia]": "Connector del libxz pel Kerfuffle", - "Description[ca]": "Connector del libxz pel Kerfuffle", - "Description[cs]": "modul libxz pro Kerfuffle", - "Description[de]": "libxz-Modul für Kerfuffle", - "Description[en_GB]": "libxz plugin for Kerfuffle", - "Description[es]": "Complemento libxz para Kerfuffle", - "Description[fi]": "libxz-pakkaustuki", - "Description[it]": "Estensione libxz per Kerfuffle", - "Description[nl]": "libxz plug-in voor Kerfuffle", - "Description[pl]": "wtyczka libxz dla Kerfuffle", - "Description[pt]": "'Plugin' de libxz para o Kerfuffle", - "Description[pt_BR]": "Plugin libxz para o Kerfuffle", - "Description[ru]": "Модуль libxz для Kerfuffle", - "Description[sk]": "libxz modul pre Kerfuffle", - "Description[sl]": "Vstavek libxz za Kerfuffle", - "Description[sr@ijekavian]": "Прикључак libxz за Керфафл", - "Description[sr@ijekavianlatin]": "Priključak libxz za Kerfuffle", - "Description[sr@latin]": "Priključak libxz za Kerfuffle", - "Description[sr]": "Прикључак libxz за Керфафл", - "Description[sv]": "Libxz-insticksprogram för Kerfuffle", - "Description[uk]": "Додаток libxz для Kerfuffle", - "Description[x-test]": "xxlibxz plugin for Kerfufflexx", - "Description[zh_CN]": "Kerfuffle 的 libxz 插件", - "Description[zh_TW]": "Kerfuffle 的 libxz 外掛程式", - "Id": "kerfuffle_libxz", + "Description": "libxz plugin for Kerfuffle", + "Description[ca@valencia]": "Connector del libxz pel Kerfuffle", + "Description[ca]": "Connector del libxz pel Kerfuffle", + "Description[cs]": "modul libxz pro Kerfuffle", + "Description[de]": "libxz-Modul für Kerfuffle", + "Description[es]": "Complemento libxz para Kerfuffle", + "Description[et]": "Kerfuffle'i libxz plugin", + "Description[fi]": "libxz-pakkaustuki", + "Description[fr]": "Module externe « libxz » pour Kerfuffle", + "Description[gl]": "Complemento de libxz para Kerfuffle", + "Description[it]": "Estensione libxz per Kerfuffle", + "Description[nl]": "libxz plug-in voor Kerfuffle", + "Description[pl]": "wtyczka libxz dla Kerfuffle", + "Description[pt]": "'Plugin' de libxz para o Kerfuffle", + "Description[pt_BR]": "Plugin libxz para o Kerfuffle", + "Description[ru]": "Модуль libxz для Kerfuffle", + "Description[sk]": "libxz modul pre Kerfuffle", + "Description[sl]": "Vstavek libxz za Kerfuffle", + "Description[sr@ijekavian]": "Прикључак libxz за Керфафл", + "Description[sr@ijekavianlatin]": "Priključak libxz za Kerfuffle", + "Description[sr@latin]": "Priključak libxz za Kerfuffle", + "Description[sr]": "Прикључак libxz за Керфафл", + "Description[sv]": "Libxz-insticksprogram för Kerfuffle", + "Description[uk]": "Додаток libxz для Kerfuffle", + "Description[x-test]": "xxlibxz plugin for Kerfufflexx", + "Description[zh_CN]": "Kerfuffle 的 libxz 插件", + "Id": "kerfuffle_libxz", "MimeTypes": [ "@SUPPORTED_MIMETYPES@" - ], - "Name": "kerfuffle_libxz", - "Name[sv]": "Kerfuffle Libxz", - "Name[x-test]": "xxkerfuffle_libxzxx", + ], + "Name": "kerfuffle_libxz", + "Name[sv]": "Kerfuffle Libxz", + "Name[x-test]": "xxkerfuffle_libxzxx", "ServiceTypes": [ "Kerfuffle/Plugin" - ], + ], "Version": "@KDE_APPLICATIONS_VERSION@" - }, + }, "X-KDE-Priority": 100 -} +} \ No newline at end of file
