Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2017-01-25 22:45:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2017-01-10 10:36:25.271077276 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2017-01-25 22:45:22.614666846 +0100 @@ -1,0 +2,10 @@ +Sat Jan 14 08:48:42 UTC 2017 - [email protected] + +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php + +- Drop 0001-Stop-running-executables-when-opening-urls.patch, + merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Stop-running-executables-when-opening-urls.patch ark-16.12.0.tar.xz New: ---- ark-16.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.GVHgQh/_old 2017-01-25 22:45:23.626514145 +0100 +++ /var/tmp/diff_new_pack.GVHgQh/_new 2017-01-25 22:45:23.634512938 +0100 @@ -18,18 +18,16 @@ %define SOMAJOR 16 Name: ark -Version: 16.12.0 +Version: 16.12.1 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE Archiver Tool License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ark-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 0001-Stop-running-executables-when-opening-urls.patch [email protected] -- Stop running executables when opening urls -Patch1: 0001-Stop-running-executables-when-opening-urls.patch BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kconfig-devel >= 5.2.0 @@ -67,7 +65,6 @@ %prep %setup -q -%patch1 -p1 %build %cmake_kf5 -d build ++++++ ark-16.12.0.tar.xz -> ark-16.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.12.0/CMakeLists.txt new/ark-16.12.1/CMakeLists.txt --- old/ark-16.12.0/CMakeLists.txt 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/CMakeLists.txt 2017-01-08 17:13:32.000000000 +0100 @@ -7,7 +7,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") 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.12.0/kerfuffle/addtoarchive.cpp new/ark-16.12.1/kerfuffle/addtoarchive.cpp --- old/ark-16.12.0/kerfuffle/addtoarchive.cpp 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/kerfuffle/addtoarchive.cpp 2017-01-08 17:13:32.000000000 +0100 @@ -106,6 +106,10 @@ setMimeType(dialog.data()->currentMimeType().name()); setPassword(dialog.data()->password()); setHeaderEncryptionEnabled(dialog.data()->isHeaderEncryptionEnabled()); + m_options.setCompressionLevel(dialog.data()->compressionLevel()); + m_options.setCompressionMethod(dialog.data()->compressionMethod()); + m_options.setEncryptionMethod(dialog.data()->encryptionMethod()); + m_options.setVolumeSize(dialog.data()->volumeSize()); } delete dialog.data(); @@ -134,6 +138,11 @@ QTimer::singleShot(0, this, &AddToArchive::slotStartJob); } +bool AddToArchive::doKill() +{ + return m_createJob && m_createJob->kill(); +} + void AddToArchive::slotStartJob() { if (m_entries.isEmpty()) { @@ -171,8 +180,6 @@ m_filename = finalName; } - Kerfuffle::CompressionOptions options; - if (m_changeToFirstPath) { if (m_firstPath.isEmpty()) { qCWarning(ARK) << "Weird, this should not happen. no firstpath defined. aborting"; @@ -187,18 +194,18 @@ } qCDebug(ARK) << "Setting GlobalWorkDir to " << stripDir.path(); - options.setGlobalWorkDir(stripDir.path()); + m_options.setGlobalWorkDir(stripDir.path()); } - auto createJob = Archive::create(m_filename, m_mimeType, m_entries, options, this); + m_createJob = Archive::create(m_filename, m_mimeType, m_entries, m_options, this); if (!m_password.isEmpty()) { - createJob->enableEncryption(m_password, m_enableHeaderEncryption); + m_createJob->enableEncryption(m_password, m_enableHeaderEncryption); } - KIO::getJobTracker()->registerJob(createJob); - connect(createJob, &KJob::result, this, &AddToArchive::slotFinished); - createJob->start(); + KIO::getJobTracker()->registerJob(m_createJob); + connect(m_createJob, &KJob::result, this, &AddToArchive::slotFinished); + m_createJob->start(); } void AddToArchive::slotFinished(KJob *job) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.12.0/kerfuffle/addtoarchive.h new/ark-16.12.1/kerfuffle/addtoarchive.h --- old/ark-16.12.0/kerfuffle/addtoarchive.h 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/kerfuffle/addtoarchive.h 2017-01-08 17:13:32.000000000 +0100 @@ -72,11 +72,16 @@ void setHeaderEncryptionEnabled(bool enabled); void start() Q_DECL_OVERRIDE; +protected: + bool doKill() Q_DECL_OVERRIDE; + private slots: void slotFinished(KJob*); void slotStartJob(); private: + CompressionOptions m_options; + CreateJob *m_createJob; QString m_filename; QString m_strippedPath; QString m_autoFilenameSuffix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.12.0/kerfuffle/jobs.cpp new/ark-16.12.1/kerfuffle/jobs.cpp --- old/ark-16.12.0/kerfuffle/jobs.cpp 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/kerfuffle/jobs.cpp 2017-01-08 17:13:32.000000000 +0100 @@ -466,21 +466,26 @@ void CreateJob::doWork() { - auto addJob = archive()->addFiles(m_entries, new Archive::Entry(this), m_options); + m_addJob = archive()->addFiles(m_entries, new Archive::Entry(this), m_options); - if (addJob) { - connect(addJob, &KJob::result, this, &CreateJob::emitResult); + if (m_addJob) { + connect(m_addJob, &KJob::result, this, &CreateJob::emitResult); // Forward description signal from AddJob, we need to change the first argument ('this' needs to be a CreateJob). - connect(addJob, &KJob::description, this, [=](KJob *, const QString &title, const QPair<QString,QString> &field1, const QPair<QString,QString> &) { + connect(m_addJob, &KJob::description, this, [=](KJob *, const QString &title, const QPair<QString,QString> &field1, const QPair<QString,QString> &) { emit description(this, title, field1); }); - addJob->start(); + m_addJob->start(); } else { emitResult(); } } +bool CreateJob::doKill() +{ + return m_addJob && m_addJob->kill(); +} + ExtractJob::ExtractJob(const QVector<Archive::Entry*> &entries, const QString &destinationDir, const ExtractionOptions &options, ReadOnlyArchiveInterface *interface) : Job(interface) , m_entries(entries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.12.0/kerfuffle/jobs.h new/ark-16.12.1/kerfuffle/jobs.h --- old/ark-16.12.0/kerfuffle/jobs.h 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/kerfuffle/jobs.h 2017-01-08 17:13:32.000000000 +0100 @@ -216,7 +216,11 @@ public slots: virtual void doWork() Q_DECL_OVERRIDE; +protected: + virtual bool doKill() Q_DECL_OVERRIDE; + private: + AddJob *m_addJob = Q_NULLPTR; QVector<Archive::Entry*> m_entries; CompressionOptions m_options; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.12.0/part/part.cpp new/ark-16.12.1/part/part.cpp --- old/ark-16.12.0/part/part.cpp 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/part/part.cpp 2017-01-08 17:13:32.000000000 +0100 @@ -988,7 +988,7 @@ } else { KRun::runUrl(QUrl::fromUserInput(fullName, QString(), QUrl::AssumeLocalFile), QMimeDatabase().mimeTypeForFile(fullName).name(), - widget()); + widget(), false, false); } } else if (job->error() != KJob::KilledJobError) { KMessageBox::error(widget(), job->errorString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-16.12.0/plugins/libarchive/libarchiveplugin.cpp new/ark-16.12.1/plugins/libarchive/libarchiveplugin.cpp --- old/ark-16.12.0/plugins/libarchive/libarchiveplugin.cpp 2016-12-06 20:58:22.000000000 +0100 +++ new/ark-16.12.1/plugins/libarchive/libarchiveplugin.cpp 2017-01-08 17:13:32.000000000 +0100 @@ -503,7 +503,7 @@ } readBytes = file.read(buff, sizeof(buff)); - while (readBytes > 0) { + while (!QThread::currentThread()->isInterruptionRequested() && readBytes > 0) { archive_write_data(dest, buff, readBytes); if (archive_errno(dest) != ARCHIVE_OK) { qCCritical(ARK) << "Error while writing" << filename << ":" << archive_error_string(dest)
