Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2016-06-20 10:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-31 12:17:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2016-06-20 10:55:31.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 10 17:45:46 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.2 + * KDE Applications 16.04.2 + * https://www.kde.org/announcements/announce-applications-16.04.2.php + + +------------------------------------------------------------------- Old: ---- ark-16.04.1.tar.xz New: ---- ark-16.04.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.pebye4/_old 2016-06-20 10:55:33.000000000 +0200 +++ /var/tmp/diff_new_pack.pebye4/_new 2016-06-20 10:55:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: ark -Version: 16.04.1 +Version: 16.04.2 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ ++++++ ark-16.04.1.tar.xz -> ark-16.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/CMakeLists.txt new/ark-16.04.2/CMakeLists.txt --- old/ark-16.04.1/CMakeLists.txt 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/CMakeLists.txt 2016-06-09 11:19:54.000000000 +0200 @@ -7,7 +7,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "04") -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.04.1/app/mainwindow.cpp new/ark-16.04.2/app/mainwindow.cpp --- old/ark-16.04.1/app/mainwindow.cpp 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/app/mainwindow.cpp 2016-06-09 11:19:54.000000000 +0200 @@ -223,16 +223,20 @@ Q_ASSERT(iface); Q_UNUSED(iface); - QPointer<QFileDialog> dlg = new QFileDialog(this, i18nc("to open an archive", "Open Archive")); + auto dlg = new QFileDialog(this, i18nc("to open an archive", "Open Archive")); dlg->setMimeTypeFilters(Kerfuffle::supportedMimeTypes()); - dlg->setFileMode(QFileDialog::ExistingFile); dlg->setAcceptMode(QFileDialog::AcceptOpen); - if (dlg->exec() == QDialog::Accepted) { - openUrl(dlg->selectedUrls().first()); - } - delete dlg; + + connect(dlg, &QDialog::finished, this, [this, dlg](int result) { + if (result == QDialog::Accepted) { + openUrl(dlg->selectedUrls().first()); + } + dlg->deleteLater(); + }); + + dlg->open(); } void MainWindow::openUrl(const QUrl& url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/app/org.kde.ark.appdata.xml new/ark-16.04.2/app/org.kde.ark.appdata.xml --- old/ark-16.04.1/app/org.kde.ark.appdata.xml 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/app/org.kde.ark.appdata.xml 2016-06-09 11:19:54.000000000 +0200 @@ -95,8 +95,8 @@ <p xml:lang="ast">Ark ye una utilidá gráfica de compresión/descompresión de ficheros con sofitu pa múltiples formatos, incluyendo tar, gzip, bzip2, rar y zip, amás d'imáxenes de CD-ROM. Ark pue usase pa restolar, estrayer, crear y modificar ficheros.</p> <p xml:lang="bg">Ark е графичен инструмент за архивиране/разархивиране, поддържащ множество формати, включително tar, gzip, bzip2, rar и zip, както и образи на CD-ROM. Ark може да се използва за разглеждане, извличане, създаване и променяне на архиви.</p> <p xml:lang="bs">Ark je grafički alat za kompresiju/dekompresiju s podrškom za više formata, uključujući tar, gzip, bzip2, rar i zip, kao i CD-ROM slike. Ark se može koristiti za kreiranje, izdvjanje i modifikaciju arhiva.</p> - <p xml:lang="ca">L'Ark és una utilitat gràfica de compressió/descompressió de fitxers que implementa múltiples formats, incloent-hi tar, gzip, bzip2, rar i zip, i també imatges de CD-ROM. L'Ark es pot utilitzar per explorar, extreure, crear, i modificar arxius.</p> - <p xml:lang="ca-valencia">L'Ark és una utilitat gràfica de compressió/descompressió de fitxers que implementa múltiples formats, incloent-hi tar, gzip, bzip2, rar i zip, i també imatges de CD-ROM. L'Ark es pot utilitzar per explorar, extreure, crear, i modificar arxius.</p> + <p xml:lang="ca">L'Ark és una utilitat gràfica de compressió/descompressió de fitxers que admet múltiples formats, incloent-hi tar, gzip, bzip2, rar i zip, i també imatges de CD-ROM. L'Ark es pot utilitzar per explorar, extreure, crear, i modificar arxius.</p> + <p xml:lang="ca-valencia">L'Ark és una utilitat gràfica de compressió/descompressió de fitxers que admet múltiples formats, incloent-hi tar, gzip, bzip2, rar i zip, i també imatges de CD-ROM. L'Ark es pot utilitzar per explorar, extreure, crear, i modificar arxius.</p> <p xml:lang="cs">Ark je grafický nástroj pro kompresi/dekompresi souborů s podporou formátů jako je tar, gzip, bzipě, rar a zip a obrazů disků CD-ROM. Ark lze použít k prohlížení, rozbalování a úpravám archivů.</p> <p xml:lang="da">Ark er et grafisk værktøj til komprimering/dekomprimering, med understøttelse for flere formater, derunder tar, gzip, bzip2, rar og zip, såvel som cd-rom-imagefiler. Ark kan bruges til at gennemse, udtrække, oprette og redigere.</p> <p xml:lang="de">Ark ist ein grafisches Dienstprogramm zum Packen/Entpacken von Dateien mit Unterstützung für mehrere Formate wie tar, gzip, bzip2, rar, zip und auch CD-Abbilder. Mit Ark können Sie können Sie Archive durchsehen, entpacken, erstellen und bearbeiten.</p> @@ -176,8 +176,8 @@ <li xml:lang="ast">Sofítense dellos formatos: gzip, bzip2, zip, rar, 7z y más</li> <li xml:lang="bg">Поддържани са много формати: gzip, bzip2, zip, rar, 7z и други</li> <li xml:lang="bs">Više podržanih formata: gzip, bzip2, zip, rar, 7z i drui</li> - <li xml:lang="ca">Diversos formats implementats: gzip, bzip2, zip, rar, 7z i més</li> - <li xml:lang="ca-valencia">Diversos formats implementats: gzip, bzip2, zip, rar, 7z i més</li> + <li xml:lang="ca">Diversos formats admesos: gzip, bzip2, zip, rar, 7z i més</li> + <li xml:lang="ca-valencia">Diversos formats admesos: gzip, bzip2, zip, rar, 7z i més</li> <li xml:lang="cs">Je podporováno několik formátů: gzip, bzip2, zip, rar, 7z a další</li> <li xml:lang="da">Flere understøttede formater: gzip, bzip2, zip, rar, 7z og flere</li> <li xml:lang="de">Mehrere unterstützte Formate wie gzip, bzip2, zip, rar, 7z und mehr</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/autotests/kerfuffle/archivetest.cpp new/ark-16.04.2/autotests/kerfuffle/archivetest.cpp --- old/ark-16.04.1/autotests/kerfuffle/archivetest.cpp 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/autotests/kerfuffle/archivetest.cpp 2016-06-09 11:19:54.000000000 +0200 @@ -161,6 +161,12 @@ } else { qDebug() << "lrzip executable not found in path. Skipping lrzip test."; } + + QTest::newRow("mimetype child of application/zip") + << QFINDTESTDATA("data/test.odt") + << QStringLiteral("test") + << false << true << false << Archive::Unencrypted + << QStringLiteral("test"); } void ArchiveTest::testProperties() Files old/ark-16.04.1/autotests/kerfuffle/data/test.odt and new/ark-16.04.2/autotests/kerfuffle/data/test.odt differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/kerfuffle/archive_kerfuffle.cpp new/ark-16.04.2/kerfuffle/archive_kerfuffle.cpp --- old/ark-16.04.1/kerfuffle/archive_kerfuffle.cpp 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/kerfuffle/archive_kerfuffle.cpp 2016-06-09 11:19:54.000000000 +0200 @@ -36,6 +36,7 @@ #include <QEventLoop> #include <QFile> #include <QFileInfo> +#include <QMimeDatabase> #include <KPluginFactory> #include <KPluginLoader> @@ -57,8 +58,24 @@ qCDebug(ARK) << "Detected mime" << mimeType; QVector<KPluginMetaData> offers = KPluginLoader::findPlugins(QStringLiteral("kerfuffle"), [mimeType](const KPluginMetaData& metaData) { - return metaData.serviceTypes().contains(QStringLiteral("Kerfuffle/Plugin")) && - metaData.mimeTypes().contains(mimeType); + if (!metaData.serviceTypes().contains(QStringLiteral("Kerfuffle/Plugin"))) { + return false; + } + + if (metaData.mimeTypes().contains(mimeType)) { + return true; + } + + // The mimetype is not directly supported, but it could inherit from a supported one. + if (!supportedMimeTypes().contains(mimeType)) { + foreach (const QString &mime, metaData.mimeTypes()) { + if (QMimeDatabase().mimeTypeForName(mimeType).inherits(mime)) { + return true; + } + } + } + + return false; }); qSort(offers.begin(), offers.end(), comparePlugins); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/kerfuffle/cliinterface.cpp new/ark-16.04.2/kerfuffle/cliinterface.cpp --- old/ark-16.04.1/kerfuffle/cliinterface.cpp 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/kerfuffle/cliinterface.cpp 2016-06-09 11:19:54.000000000 +0200 @@ -980,8 +980,8 @@ if (!query.responseYes()) { emit cancelled(); failOperation(); - return; } + return; } if (handleFileExistsMessage(line)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/part/infopanel.ui new/ark-16.04.2/part/infopanel.ui --- old/ark-16.04.1/part/infopanel.ui 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/part/infopanel.ui 2016-06-09 11:19:54.000000000 +0200 @@ -1,33 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>InformationPanel</class> - <widget class="QWidget" name="InformationPanel" > - <property name="geometry" > + <widget class="QWidget" name="InformationPanel"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>118</width> + <width>140</width> <height>300</height> </rect> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Maximum" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Information Panel</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="iconLabel" > - <property name="text" > + <widget class="QLabel" name="iconLabel"> + <property name="text"> <string/> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> @@ -47,64 +50,76 @@ <property name="wordWrap"> <bool>true</bool> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> <property name="textElideMode"> <enum>Qt::ElideRight</enum> </property> </widget> </item> <item> - <widget class="QLabel" name="additionalInfo" > - <property name="text" > + <widget class="QLabel" name="additionalInfo"> + <property name="text"> <string>Unknown file type</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> - <widget class="Line" name="firstSeparator" > - <property name="orientation" > + <widget class="Line" name="firstSeparator"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QLabel" name="metadataLabel" > - <property name="text" > + <widget class="QLabel" name="metadataLabel"> + <property name="text"> <string>Metadata Label</string> </property> - <property name="margin" > + <property name="margin"> <number>10</number> </property> - <property name="indent" > + <property name="indent"> <number>20</number> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> - <widget class="Line" name="secondSeparator" > - <property name="orientation" > + <widget class="Line" name="secondSeparator"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QLabel" name="actionsLabel" > - <property name="text" > + <widget class="QLabel" name="actionsLabel"> + <property name="text"> <string>ActionsLabel</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.04.1/part/part.cpp new/ark-16.04.2/part/part.cpp --- old/ark-16.04.1/part/part.cpp 2016-05-05 22:33:56.000000000 +0200 +++ new/ark-16.04.2/part/part.cpp 2016-06-09 11:19:54.000000000 +0200 @@ -817,7 +817,7 @@ list.append(QUrl::fromUserInput(fullName, QString(), QUrl::AssumeLocalFile)); - KRun::displayOpenWithDialog(list, widget(), true); + KRun::displayOpenWithDialog(list, widget(), false); break; }
