Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2016-02-22 10:14:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-23 01:05:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2016-02-22 10:14:14.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Feb 13 08:00:11 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 15.12.2 + * KDE Applications 15.12.2 + * https://www.kde.org/announcements/announce-applications-15.12.2.php + * boo#966605 + + +------------------------------------------------------------------- Old: ---- ark-15.12.1.tar.xz New: ---- ark-15.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.HB1rEw/_old 2016-02-22 10:14:15.000000000 +0100 +++ /var/tmp/diff_new_pack.HB1rEw/_new 2016-02-22 10:14:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: ark -Version: 15.12.1 +Version: 15.12.2 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ ++++++ ark-15.12.1.tar.xz -> ark-15.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/CMakeLists.txt new/ark-15.12.2/CMakeLists.txt --- old/ark-15.12.1/CMakeLists.txt 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/CMakeLists.txt 2016-02-12 06:16:00.000000000 +0100 @@ -7,7 +7,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "12") -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-15.12.1/app/ark_addtoservicemenu.desktop new/ark-15.12.2/app/ark_addtoservicemenu.desktop --- old/ark-15.12.1/app/ark_addtoservicemenu.desktop 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/app/ark_addtoservicemenu.desktop 2016-02-12 06:16:00.000000000 +0100 @@ -16,7 +16,7 @@ X-KDE-Submenu[el]=Συμπίεση X-KDE-Submenu[en_GB]=Compress X-KDE-Submenu[es]=Comprimir -X-KDE-Submenu[et]=Paki +X-KDE-Submenu[et]=Pakkimine X-KDE-Submenu[eu]=Konprimatu X-KDE-Submenu[fi]=Pakkaa X-KDE-Submenu[fr]=Compresser @@ -74,7 +74,8 @@ Name[de]=Hier (Als TAR.GZ-Archiv) Name[en_GB]=Here (as TAR.GZ) Name[es]=Aquí (como TAR.GZ) -Name[fi]=Tähän (TAR.GZ-paketiksi) +Name[et]=Siia (TAR.GZ-arhiivina) +Name[fi]=Tähän (TAR.GZ-arkistoksi) Name[fr]=Ici (en tar.gz) Name[gl]=Aquí (como TAR.GZ) Name[hu]=Ide (tar.gz-ként) @@ -110,7 +111,8 @@ Name[de]=Hier (Als ZIP-Archiv) Name[en_GB]=Here (as ZIP) Name[es]=Aquí (como ZIP) -Name[fi]=Tähän (ZIP-paketiksi) +Name[et]=Siia (ZIP-arhiivina) +Name[fi]=Tähän (ZIP-arkistoksi) Name[fr]=Ici (en zip) Name[gl]=Aquí (como ZIP) Name[hu]=Ide (zip-ként) @@ -146,7 +148,8 @@ Name[de]=Hier (Als RAR-Archiv) Name[en_GB]=Here (as RAR) Name[es]=Aquí (como RAR) -Name[fi]=Tähän (RAR-paketiksi) +Name[et]=Siia (RAR-arhiivina) +Name[fi]=Tähän (RAR-arkistoksi) Name[fr]=Ici (en rar) Name[gl]=Aquí (como RAR) Name[hu]=Ide (rar-ként) @@ -182,6 +185,7 @@ Name[de]=Komprimieren nach ... Name[en_GB]=Compress to... Name[es]=Comprimir en... +Name[et]=Paki asukohta... Name[fi]=Pakkaa… Name[fr]=Compresser vers... Name[gl]=Comprimir en… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/app/ark_servicemenu.desktop.cmake new/ark-15.12.2/app/ark_servicemenu.desktop.cmake --- old/ark-15.12.1/app/ark_servicemenu.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/app/ark_servicemenu.desktop.cmake 2016-02-12 06:16:00.000000000 +0100 @@ -67,7 +67,8 @@ Name[de]=Archiv hierher auspacken Name[en_GB]=Extract archive here Name[es]=Extraer archivo comprimido aquí -Name[fi]=Pura paketti tähän +Name[et]=Paki arhiiv siia lahti +Name[fi]=Pura arkisto tähän Name[fr]=Extraire l'archive ici Name[gl]=Extraer o arquivo aquí Name[it]=Estrai l'archivio qui @@ -101,7 +102,8 @@ Name[de]=Archiv auspacken nach ... Name[en_GB]=Extract archive to... Name[es]=Extraer archivo comprimido en... -Name[fi]=Pura paketti… +Name[et]=Paki arhiiv lahti asukohta... +Name[fi]=Pura arkisto… Name[fr]=Extraire l'archive vers... Name[gl]=Extraer o arquivo en… Name[it]=Estrai l'archivio in... @@ -135,7 +137,8 @@ Name[de]=Archiv hierher auspacken, Unterordner selbständig ermitteln Name[en_GB]=Extract archive here, autodetect subfolder Name[es]=Extraer archivo comprimido aquí, autodetectar subcarpeta -Name[fi]=Pura paketti tähän, tunnista alikansio automaattisesti +Name[et]=Paki arhiiv siia lahti, tuvasta automaatselt alamkataloog +Name[fi]=Pura arkisto tähän, tunnista alikansio automaattisesti Name[fr]=Extraire l'archive ici, auto-détecter les sous-dossiers Name[gl]=Extraer o arquivo aquí, detectar o subcartafol Name[it]=Estrai l'archivio qui, autorileva la sottocartella diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/app/org.kde.ark.appdata.xml new/ark-15.12.2/app/org.kde.ark.appdata.xml --- old/ark-15.12.1/app/org.kde.ark.appdata.xml 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/app/org.kde.ark.appdata.xml 2016-02-12 06:16:00.000000000 +0100 @@ -104,7 +104,7 @@ <p xml:lang="en-GB">Ark is a graphical file compression/decompression utility with support for multiple formats, including tar, gzip, bzip2, rar and zip, as well as CD-ROM images. Ark can be used to browse, extract, create, and modify archives.</p> <p xml:lang="es">Ark es una utilidad gráfica de compresión y descompresión de archivos que permite usar diversos formatos, como tar, gzip, bzip2, rar y zip, así como imágenes de CD-ROM. Ark se puede usar para explorar, extraer, crear y modificar archivos comprimidos.</p> <p xml:lang="et">Ark on graafiline failide tihendamise ehk kokkupakkimise ja nende lahtipakkimise tööriist, mis toetab väga paljusid vorminguid, sealhulgas tar, gzip, bzip2, rar and zip, samuti CD-ROM-i tõmmised. Arki abil saab arhiivifaile sirvida, lahti pakkida, luua ja muuta.</p> - <p xml:lang="fi">Ark on graafinen tiedostojen pakkaus-/purkuohjelma, joka tukee useita tiedostomuotoja kuten tar, gzip, bzip2, rar and zip sekä myös CD-ROM-levykuvia. Arkilla voi selata, purkaa, luoda ja muuttaa paketteja.</p> + <p xml:lang="fi">Ark on graafinen tiedostojen pakkaus-/purkuohjelma, joka tukee useita tiedostomuotoja kuten tar, gzip, bzip2, rar and zip sekä myös CD-ROM-levykuvia. Arkilla voi selata, purkaa, luoda ja muuttaa arkistoja.</p> <p xml:lang="fr">Ark est un utilitaire graphique de compression/décompression de fichier prenant en charge de multiples formats, notamment tar, gzip, bzip2, rar et zip, ainsi que les images de CD-ROM. Ark peut être utilisé pour parcourir, extraire, créer et modifier des archives.</p> <p xml:lang="gl">Ark é unha ferramenta gráfica de compresión e descompresión de ficheiros compatíbel con múltiplos formatos, como «tar», «gzip», «bzip2», «rar» e «zip», así como imaxes de CD-ROM. Ark pode usarse para navegar, extraer, crear e modificar arquivos.</p> <p xml:lang="hu">Az Ark egy grafikus fájltömörítő és kibontó segédprogram többféle formátum támogatásával, beleértve a tar, gzip, bzip2, rar és zip formátumokat, valamint a CD-ROM képfájlokat. Az Ark használható archívumok böngészéséhez, kibontásához, létrehozásához és módosításához.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/app/org.kde.ark.desktop.cmake new/ark-15.12.2/app/org.kde.ark.desktop.cmake --- old/ark-15.12.1/app/org.kde.ark.desktop.cmake 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/app/org.kde.ark.desktop.cmake 2016-02-12 06:16:00.000000000 +0100 @@ -147,7 +147,7 @@ Name[x-test]=xxArkxx Name[zh_CN]=Ark Name[zh_TW]=Ark -Exec=ark -qwindowtitle %c %U +Exec=ark %U Icon=ark X-DocPath=ark/index.html Type=Application @@ -161,11 +161,13 @@ Comment[ast]=Trabaya con archivos Comment[ca]=Treball amb arxius de fitxer Comment[ca@valencia]=Treball amb arxius de fitxer +Comment[cs]=Práce s archivy souborů Comment[da]=Arbejd med filarkiver Comment[de]=Arbeiten mit Dateiarchiven Comment[en_GB]=Work with file archives Comment[es]=Trabajar con archivos comprimidos -Comment[fi]=Käsittele tiedostopaketteja +Comment[et]=Arhiivifailide käitlemine +Comment[fi]=Käsittele tiedostoarkistoja Comment[fr]=Travailler avec des archives Comment[gl]=Traballa con arquivos de ficheiros Comment[it]=Lavora con gli archivi di file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/kerfuffle/addtoarchive.cpp new/ark-15.12.2/kerfuffle/addtoarchive.cpp --- old/ark-15.12.1/kerfuffle/addtoarchive.cpp 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/kerfuffle/addtoarchive.cpp 2016-02-12 06:16:00.000000000 +0100 @@ -132,16 +132,13 @@ QTimer::singleShot(0, this, &AddToArchive::slotStartJob); } -// TODO: If this class should ever be called outside main.cpp, -// the returns should be preceded by emitResult(). void AddToArchive::slotStartJob() { - - Kerfuffle::CompressionOptions options; if (!m_inputs.size()) { KMessageBox::error(NULL, i18n("No input files were given.")); + emitResult(); return; } @@ -152,11 +149,13 @@ } else { if (m_autoFilenameSuffix.isEmpty()) { KMessageBox::error(Q_NULLPTR, xi18n("You need to either supply a filename for the archive or a suffix (such as rar, tar.gz) with the <command>--autofilename</command> argument.")); + emitResult(); return; } if (m_firstPath.isEmpty()) { qCWarning(ARK) << "Weird, this should not happen. no firstpath defined. aborting"; + emitResult(); return; } @@ -183,9 +182,11 @@ if (!archive->isValid()) { KMessageBox::error(Q_NULLPTR, i18n("Failed to create the new archive. Permissions might not be sufficient.")); + emitResult(); return; } else if (archive->isReadOnly()) { KMessageBox::error(Q_NULLPTR, i18n("It is not possible to create archives of this type.")); + emitResult(); return; } @@ -197,6 +198,7 @@ if (m_changeToFirstPath) { if (m_firstPath.isEmpty()) { qCWarning(ARK) << "Weird, this should not happen. no firstpath defined. aborting"; + emitResult(); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/kerfuffle/archive_kerfuffle.cpp new/ark-15.12.2/kerfuffle/archive_kerfuffle.cpp --- old/ark-15.12.1/kerfuffle/archive_kerfuffle.cpp 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/kerfuffle/archive_kerfuffle.cpp 2016-02-12 06:16:00.000000000 +0100 @@ -93,6 +93,11 @@ return mimeFromExtension.name(); } + // #354344: ISO files are currently wrongly detected-by-content. + if (mimeFromExtension.inherits(QStringLiteral("application/x-cd-image"))) { + return mimeFromExtension.name(); + } + qCWarning(ARK) << "Mimetype for filename extension (" << mimeFromExtension.name() << ") did not match mimetype for content (" << mimeFromContent.name() << "). Using content-based mimetype."; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/kerfuffle/kerfufflePlugin.desktop new/ark-15.12.2/kerfuffle/kerfufflePlugin.desktop --- old/ark-15.12.1/kerfuffle/kerfufflePlugin.desktop 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/kerfuffle/kerfufflePlugin.desktop 2016-02-12 06:16:00.000000000 +0100 @@ -16,7 +16,7 @@ Comment[es]=Complemento para manejar formatos de archivo de la biblioteca Kerfuffle Comment[et]=Kerfuffle'i teegi arhiivifailide haldamise plugin Comment[eu]=Kerfuffle liburutegiaren artxibo-formatuak erabiltzeko plugina -Comment[fi]=Kerfuffle-kirjaston pakettimuotojen tuki +Comment[fi]=Kerfuffle-kirjaston arkistomuotojen tuki Comment[fr]=Module externe de gestion des formats d'archives pour la bibliothèque « Kerfuffle » Comment[ga]=Breiseán a láimhseálann formáidí cartlainne thar ceann na leabharlainne Kerfuffle Comment[gl]=Extensión da biblioteca Kerfuffle para manexar formatos de arquivo Files old/ark-15.12.1/kerfuffle/tests/data/archlinux-2015.09.01-dual_truncated.iso and new/ark-15.12.2/kerfuffle/tests/data/archlinux-2015.09.01-dual_truncated.iso differ Files old/ark-15.12.1/kerfuffle/tests/data/kubuntu-14.04.1-desktop-amd64_truncated.iso and new/ark-15.12.2/kerfuffle/tests/data/kubuntu-14.04.1-desktop-amd64_truncated.iso differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/kerfuffle/tests/mimetypetest.cpp new/ark-15.12.2/kerfuffle/tests/mimetypetest.cpp --- old/ark-15.12.1/kerfuffle/tests/mimetypetest.cpp 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/kerfuffle/tests/mimetypetest.cpp 2016-02-12 06:16:00.000000000 +0100 @@ -39,6 +39,7 @@ void testTarDetection(); void testWrongZipExtension(); void testSpecialCharsTarExtension(); + void testIsoDetection(); }; QTEST_GUILESS_MAIN(MimeTypeTest) @@ -62,9 +63,22 @@ void MimeTypeTest::testSpecialCharsTarExtension() { - const QString tarMimeype = QStringLiteral("application/x-compressed-tar"); - QCOMPARE(Archive::determineMimeType(QStringLiteral("foo.tar~1.gz")), tarMimeype); - QCOMPARE(Archive::determineMimeType(QStringLiteral("foo.ta4r.gz")), tarMimeype); + const QString tarMimeType = QStringLiteral("application/x-compressed-tar"); + QCOMPARE(Archive::determineMimeType(QStringLiteral("foo.tar~1.gz")), tarMimeType); + QCOMPARE(Archive::determineMimeType(QStringLiteral("foo.ta4r.gz")), tarMimeType); +} + +void MimeTypeTest::testIsoDetection() +{ + const QString isoMimeType = QStringLiteral("application/x-cd-image"); + + // Test workaround for https://bugs.freedesktop.org/show_bug.cgi?id=80877 + // 1. This ISO file may be detected-by-content as text/plain. + const QString archIso = QFINDTESTDATA("data/archlinux-2015.09.01-dual_truncated.iso"); + QCOMPARE(Archive::determineMimeType(archIso), isoMimeType); + // 2. This ISO may not bet detected-by-content. + const QString kubuntuIso = QFINDTESTDATA("data/kubuntu-14.04.1-desktop-amd64_truncated.iso"); + QCOMPARE(Archive::determineMimeType(kubuntuIso), isoMimeType); } #include "mimetypetest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.1/part/part.cpp new/ark-15.12.2/part/part.cpp --- old/ark-15.12.1/part/part.cpp 2016-01-07 00:07:30.000000000 +0100 +++ new/ark-15.12.2/part/part.cpp 2016-02-12 06:16:00.000000000 +0100 @@ -355,6 +355,8 @@ (selectedEntriesCount == 1)); m_extractFilesAction->setEnabled(!isBusy() && (m_model->rowCount() > 0)); + m_saveAsAction->setEnabled(!isBusy() && + m_model->rowCount() > 0); m_addFilesAction->setEnabled(!isBusy() && isWritable); m_addDirAction->setEnabled(!isBusy() && @@ -365,11 +367,11 @@ m_openFileAction->setEnabled(!isBusy() && isPreviewable && !isDirectory && - (selectedEntriesCount > 0)); + (selectedEntriesCount == 1)); m_openFileWithAction->setEnabled(!isBusy() && isPreviewable && !isDirectory && - (selectedEntriesCount > 0)); + (selectedEntriesCount == 1)); QMenu *menu = m_extractFilesAction->menu(); if (!menu) {
