Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2016-03-26 15:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-22 10:14:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2016-03-26 15:12:47.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Mar 13 15:32:44 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.3 + * KDE Applications 15.12.3 + * https://www.kde.org/announcements/announce-applications-15.12.3.php + * boo#970855 + + +------------------------------------------------------------------- Old: ---- ark-15.12.2.tar.xz New: ---- ark-15.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.Nt5ocw/_old 2016-03-26 15:12:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Nt5ocw/_new 2016-03-26 15:12:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: ark -Version: 15.12.2 +Version: 15.12.3 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ ++++++ ark-15.12.2.tar.xz -> ark-15.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/CMakeLists.txt new/ark-15.12.3/CMakeLists.txt --- old/ark-15.12.2/CMakeLists.txt 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/CMakeLists.txt 2016-03-10 23:24:45.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 "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") 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.2/kerfuffle/addtoarchive.cpp new/ark-15.12.3/kerfuffle/addtoarchive.cpp --- old/ark-15.12.2/kerfuffle/addtoarchive.cpp 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/addtoarchive.cpp 2016-03-10 23:24:45.000000000 +0100 @@ -159,10 +159,7 @@ return; } - QString base = QFileInfo(m_inputs.first()).absoluteFilePath(); - if (base.endsWith(QLatin1Char('/'))) { - base.chop(1); - } + const QString base = detectBaseName(m_inputs); QString finalName = base + QLatin1Char( '.' ) + m_autoFilenameSuffix; @@ -233,4 +230,22 @@ emitResult(); } + +QString AddToArchive::detectBaseName(const QStringList &paths) const +{ + QString base = QFileInfo(paths.first()).absoluteFilePath(); + if (paths.size() > 1) { + QDir dir = QFileInfo(paths.first()).dir(); + if (!dir.isRoot()) { + base = dir.absolutePath() + QLatin1Char('/') + dir.dirName(); + } + } + + if (base.endsWith(QLatin1Char('/'))) { + base.chop(1); + } + + return base; +} + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/kerfuffle/addtoarchive.h new/ark-15.12.3/kerfuffle/addtoarchive.h --- old/ark-15.12.2/kerfuffle/addtoarchive.h 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/addtoarchive.h 2016-03-10 23:24:45.000000000 +0100 @@ -60,6 +60,7 @@ bool showAddDialog(); void setPreservePaths(bool value); void setChangeToFirstPath(bool value); + QString detectBaseName(const QStringList &paths) const; public slots: bool addInput(const QUrl &url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/kerfuffle/cliinterface.cpp new/ark-15.12.3/kerfuffle/cliinterface.cpp --- old/ark-15.12.2/kerfuffle/cliinterface.cpp 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/cliinterface.cpp 2016-03-10 23:24:45.000000000 +0100 @@ -270,7 +270,7 @@ } } - bool useTmpExtractDir = !files.isEmpty(); + bool useTmpExtractDir = options.value(QStringLiteral("DragAndDrop")).toBool(); QUrl destDir; QTemporaryDir tmpExtractDir; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/kerfuffle/createdialog.cpp new/ark-15.12.3/kerfuffle/createdialog.cpp --- old/ark-15.12.2/kerfuffle/createdialog.cpp 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/createdialog.cpp 2016-03-10 23:24:45.000000000 +0100 @@ -138,7 +138,7 @@ void CreateDialog::restoreWindowSize() { // Restore window size from config file, needs a windowHandle so must be called after show() - KConfigGroup group(KSharedConfig::openConfig(), "AddDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "CreateDialog"); //KWindowConfig::restoreWindowSize(windowHandle(), group); //KWindowConfig::restoreWindowSize is broken atm., so we need this hack: const QRect desk = windowHandle()->screen()->geometry(); @@ -211,13 +211,15 @@ if (m_ui->groupEncryptionOptions->isEnabled()) { m_ui->encryptHeaderCheckBox->setToolTip(i18n("Protection of the list of files is not possible with the %1 format.", QMimeDatabase().mimeTypeForName(filter).comment())); + } else { + m_ui->encryptHeaderCheckBox->setToolTip(QString()); } } } void CreateDialog::loadConfiguration() { - m_config = KConfigGroup(KSharedConfig::openConfig()->group("AddDialog")); + m_config = KConfigGroup(KSharedConfig::openConfig()->group("CreateDialog")); const QString defaultMimeType = QStringLiteral("application/x-compressed-tar"); const QString lastMimeType = m_config.readEntry("LastMimeType", defaultMimeType); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/kerfuffle/extractiondialog.cpp new/ark-15.12.3/kerfuffle/extractiondialog.cpp --- old/ark-15.12.2/kerfuffle/extractiondialog.cpp 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/extractiondialog.cpp 2016-03-10 23:24:45.000000000 +0100 @@ -119,13 +119,15 @@ void ExtractionDialog::slotOkButtonClicked() { + const QString destinationPath = fileWidget->baseUrl().path(); + if (extractToSubfolder()) { if (subfolder().contains(QLatin1String( "/" ))) { KMessageBox::error(this, i18n("The subfolder name may not contain the character '/'.")); return; } - const QString pathWithSubfolder = fileWidget->baseUrl().path() + subfolder(); + const QString pathWithSubfolder = destinationPath + subfolder(); while (1) { if (QDir(pathWithSubfolder).exists()) { @@ -154,6 +156,16 @@ } } + //Adding new destination value to arkrc for quickExtractMenu. + KConfigGroup conf(KSharedConfig::openConfig(), "ExtractDialog"); + QStringList destHistory = conf.readPathEntry("DirHistory", QStringList()); + destHistory.prepend(destinationPath); + destHistory.removeDuplicates(); + if (destHistory.size() > 10) { + destHistory.removeLast(); + } + conf.writePathEntry ("DirHistory", destHistory); + fileWidget->slotOk(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/kerfuffle/extractionsettings.ui new/ark-15.12.3/kerfuffle/extractionsettings.ui --- old/ark-15.12.2/kerfuffle/extractionsettings.ui 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/extractionsettings.ui 2016-03-10 23:24:45.000000000 +0100 @@ -10,9 +10,6 @@ <height>487</height> </rect> </property> - <property name="windowTitle"> - <string>Form</string> - </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QCheckBox" name="kcfg_openDestinationFolderAfterExtraction"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/kerfuffle/previewsettings.ui new/ark-15.12.3/kerfuffle/previewsettings.ui --- old/ark-15.12.2/kerfuffle/previewsettings.ui 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/kerfuffle/previewsettings.ui 2016-03-10 23:24:45.000000000 +0100 @@ -10,9 +10,6 @@ <height>487</height> </rect> </property> - <property name="windowTitle"> - <string>Form</string> - </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QLabel" name="label"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/part/part.cpp new/ark-15.12.3/part/part.cpp --- old/ark-15.12.2/part/part.cpp 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/part/part.cpp 2016-03-10 23:24:45.000000000 +0100 @@ -225,6 +225,7 @@ Kerfuffle::ExtractionOptions options; options[QStringLiteral("PreservePaths")] = true; options[QStringLiteral("RemoveRootNode")] = true; + options[QStringLiteral("DragAndDrop")] = true; // Create and start the ExtractJob. ExtractJob *job = m_model->extractFiles(filesAndRootNodesForIndexes(addChildren(m_view->selectionModel()->selectedRows())), destination, options); @@ -399,8 +400,8 @@ menu->removeAction(menu->actions().last()); } - const KConfigGroup conf(KSharedConfig::openConfig(), "DirSelect Dialog"); - const QStringList dirHistory = conf.readPathEntry("History Items", QStringList()); + const KConfigGroup conf(KSharedConfig::openConfig(), "ExtractDialog"); + const QStringList dirHistory = conf.readPathEntry("DirHistory", QStringList()); for (int i = 0; i < qMin(10, dirHistory.size()); ++i) { const QString dir = QUrl(dirHistory.value(i)).toString(QUrl::RemoveScheme | QUrl::NormalizePathSegments | QUrl::PreferLocalFile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/plugins/cli7zplugin/cliplugin.cpp new/ark-15.12.3/plugins/cli7zplugin/cliplugin.cpp --- old/ark-15.12.2/plugins/cli7zplugin/cliplugin.cpp 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/plugins/cli7zplugin/cliplugin.cpp 2016-03-10 23:24:45.000000000 +0100 @@ -96,7 +96,7 @@ << QStringLiteral("S") //autoskip << QStringLiteral("Q"); //cancel - p[PasswordPromptPattern] = QStringLiteral("Enter password \\(will not be echoed\\) :"); + p[PasswordPromptPattern] = QStringLiteral("Enter password \\(will not be echoed\\)"); p[CorruptArchivePatterns] = QStringList() << QStringLiteral("Unexpected end of archive") << QStringLiteral("Headers Error"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-15.12.2/plugins/libarchive/kerfuffle_libarchive.desktop.cmake new/ark-15.12.3/plugins/libarchive/kerfuffle_libarchive.desktop.cmake --- old/ark-15.12.2/plugins/libarchive/kerfuffle_libarchive.desktop.cmake 2016-02-12 06:16:00.000000000 +0100 +++ new/ark-15.12.3/plugins/libarchive/kerfuffle_libarchive.desktop.cmake 2016-03-10 23:24:45.000000000 +0100 @@ -107,7 +107,7 @@ Comment[nds]=LibArchive-Moduul för Kerfuffle Comment[nl]=LibArchive-plug-in voor Kerfuffle Comment[nn]=LibArchive-programtillegg til Kerfuffle -Comment[pl]=Wtyczka libArchive dla Kerfuffle +Comment[pl]=Wtyczka LibArchive dla Kerfuffle Comment[pt]='Plugin' de LibArchive para o Kerfuffle Comment[pt_BR]=Plugin LibArchive para a Kerfuffle Comment[ro]=Modul LibArchive pentru Kerfuffle
