Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2014-06-19 13:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-22 06:51:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2014-06-19 13:16:50.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 8 18:38:25 UTC 2014 - [email protected] + +- Update to 4.13.2 + * KDE 4.13 release + * See http://www.kde.org/announcements/announce-4.13.2.php + +------------------------------------------------------------------- Old: ---- ark-4.13.1.tar.xz New: ---- ark-4.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.C8nsEx/_old 2014-06-19 13:16:51.000000000 +0200 +++ /var/tmp/diff_new_pack.C8nsEx/_new 2014-06-19 13:16:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: ark -Version: 4.13.1 +Version: 4.13.2 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ ++++++ ark-4.13.1.tar.xz -> ark-4.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/app/ark_addtoservicemenu.desktop new/ark-4.13.2/app/ark_addtoservicemenu.desktop --- old/ark-4.13.1/app/ark_addtoservicemenu.desktop 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/app/ark_addtoservicemenu.desktop 2014-06-03 11:32:36.000000000 +0200 @@ -249,8 +249,10 @@ Name=As TAR.GZ Archive Name[ca]=Com a arxiu TAR.GZ Name[cs]=Jako archiv TAR.GZ +Name[da]=Som TAR.GZ-arkiv Name[de]=Als TAR.GZ-Archiv Name[es]=Como archivo comprimido TAR.GZ +Name[et]=TAR.GZ-arhiivina Name[fi]=TAR.GZ-paketiksi Name[hu]=TAR.GZ archívumként Name[ia]=Como archivo TAR.GZ @@ -260,6 +262,11 @@ Name[pt]=Como Pacote TAR.GZ Name[pt_BR]=Como arquivo TAR.GZ Name[sk]=Ako TAR.GZ archív +Name[sl]=Kot arhiv TAR.GZ +Name[sr]=као таргз архиву +Name[sr@ijekavian]=као таргз архиву +Name[sr@ijekavianlatin]=kao targz arhivu +Name[sr@latin]=kao targz arhivu Name[sv]=Som TAR.GZ-arkiv Name[tr]=TAR.GZ Arşivi Olarak Name[uk]=Як архів TAR.GZ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/kerfuffle/cliinterface.cpp new/ark-4.13.2/kerfuffle/cliinterface.cpp --- old/ark-4.13.1/kerfuffle/cliinterface.cpp 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/kerfuffle/cliinterface.cpp 2014-06-03 11:32:36.000000000 +0200 @@ -54,7 +54,8 @@ CliInterface::CliInterface(QObject *parent, const QVariantList & args) : ReadWriteArchiveInterface(parent, args), m_process(0), - m_listEmptyLines(false) + m_listEmptyLines(false), + m_abortingOperation(false) { //because this interface uses the event loop setWaitForFinishedSignal(true); @@ -352,6 +353,8 @@ #else m_process = new KPtyProcess; m_process->setPtyChannels(KPtyProcess::StdinChannel); + QEventLoop loop; + connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), &loop, SLOT(quit()), Qt::DirectConnection); #endif m_process->setOutputChannelMode(KProcess::MergedChannels); @@ -368,7 +371,6 @@ #ifdef Q_OS_WIN bool ret = m_process->waitForFinished(-1); #else - QEventLoop loop; bool ret = (loop.exec(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents) == 0); #endif @@ -427,6 +429,9 @@ //etc), so keep in mind that this function is supposed to handle //all those special cases and be the lowest common denominator + if (m_abortingOperation) + return; + Q_ASSERT(m_process); if (!m_process->bytesAvailable()) { @@ -689,9 +694,11 @@ { if (m_process) { // Give some time for the application to finish gracefully + m_abortingOperation = true; if (!m_process->waitForFinished(5)) { m_process->kill(); } + m_abortingOperation = false; return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/kerfuffle/cliinterface.h new/ark-4.13.2/kerfuffle/cliinterface.h --- old/ark-4.13.1/kerfuffle/cliinterface.h 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/kerfuffle/cliinterface.h 2014-06-03 11:32:36.000000000 +0200 @@ -338,6 +338,7 @@ ParameterList m_param; QVariantList m_removedFiles; bool m_listEmptyLines; + bool m_abortingOperation; private slots: void readStdout(bool handleAll = false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/kerfuffle/jobs.cpp new/ark-4.13.2/kerfuffle/jobs.cpp --- old/ark-4.13.1/kerfuffle/jobs.cpp 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/kerfuffle/jobs.cpp 2014-06-03 11:32:36.000000000 +0200 @@ -119,7 +119,7 @@ connect(archiveInterface(), SIGNAL(entryRemoved(QString)), SLOT(onEntryRemoved(QString))); connect(archiveInterface(), SIGNAL(progress(double)), SLOT(onProgress(double))); connect(archiveInterface(), SIGNAL(info(QString)), SLOT(onInfo(QString))); - connect(archiveInterface(), SIGNAL(finished(bool)), SLOT(onFinished(bool))); + connect(archiveInterface(), SIGNAL(finished(bool)), SLOT(onFinished(bool)), Qt::DirectConnection); connect(archiveInterface(), SIGNAL(userQuery(Query*)), SLOT(onUserQuery(Query*))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/part/jobtracker.cpp new/ark-4.13.2/part/jobtracker.cpp --- old/ark-4.13.1/part/jobtracker.cpp 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/part/jobtracker.cpp 2014-06-03 11:32:36.000000000 +0200 @@ -36,6 +36,14 @@ resetUi(); } +JobTracker::~JobTracker() +{ + foreach(KJob *job, m_jobs) { + job->kill(); + delete job; + } +} + void JobTracker::description(KJob *job, const QString &title, const QPair< QString, QString > &f1, const QPair< QString, QString > &f2) { Q_UNUSED(job) @@ -62,6 +70,7 @@ void JobTracker::registerJob(KJob *job) { + m_jobs << job; KJobTrackerInterface::registerJob(job); m_ui->show(); m_ui->informationLabel->hide(); @@ -78,6 +87,7 @@ void JobTracker::unregisterJob(KJob *job) { + m_jobs.remove(job); KJobTrackerInterface::unregisterJob(job); resetUi(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/part/jobtracker.h new/ark-4.13.2/part/jobtracker.h --- old/ark-4.13.1/part/jobtracker.h 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/part/jobtracker.h 2014-06-03 11:32:36.000000000 +0200 @@ -42,6 +42,7 @@ public: JobTracker(QWidget *parent = 0); + ~JobTracker(); virtual QWidget *widget(KJob *); @@ -61,6 +62,7 @@ private: JobTrackerWidget *m_ui; + QSet<KJob*> m_jobs; }; #endif // JOBTRACKER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/plugins/libarchive/libarchivehandler.cpp new/ark-4.13.2/plugins/libarchive/libarchivehandler.cpp --- old/ark-4.13.1/plugins/libarchive/libarchivehandler.cpp 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/plugins/libarchive/libarchivehandler.cpp 2014-06-03 11:32:36.000000000 +0200 @@ -72,6 +72,7 @@ , m_extractedFilesSize(0) , m_workDir(QDir::current()) , m_archiveReadDisk(archive_read_disk_new()) + , m_abortOperation(false) { archive_read_disk_set_standard_lookup(m_archiveReadDisk.data()); } @@ -110,7 +111,7 @@ struct archive_entry *aentry; int result; - while ((result = archive_read_next_header(arch_reader.data(), &aentry)) == ARCHIVE_OK) { + while (!m_abortOperation && (result = archive_read_next_header(arch_reader.data(), &aentry)) == ARCHIVE_OK) { if (!m_emitNoEntries) { emitEntryFromArchiveEntry(aentry); } @@ -120,6 +121,7 @@ m_cachedArchiveEntryCount++; archive_read_data_skip(arch_reader.data()); } + m_abortOperation = false; if (result != ARCHIVE_EOF) { emit error(i18nc("@info", "The archive reading failed with the following error: <message>%1</message>", @@ -130,6 +132,12 @@ return archive_read_close(arch_reader.data()) == ARCHIVE_OK; } +bool LibArchiveInterface::doKill() +{ + m_abortOperation = true; + return true; +} + bool LibArchiveInterface::copyFiles(const QVariantList& files, const QString& destinationDirectory, ExtractionOptions options) { kDebug() << "Changing current directory to " << destinationDirectory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.13.1/plugins/libarchive/libarchivehandler.h new/ark-4.13.2/plugins/libarchive/libarchivehandler.h --- old/ark-4.13.1/plugins/libarchive/libarchivehandler.h 2014-05-07 09:21:12.000000000 +0200 +++ new/ark-4.13.2/plugins/libarchive/libarchivehandler.h 2014-06-03 11:32:36.000000000 +0200 @@ -45,6 +45,7 @@ ~LibArchiveInterface(); bool list(); + bool doKill(); bool copyFiles(const QVariantList& files, const QString& destinationDirectory, ExtractionOptions options); bool addFiles(const QStringList& files, const CompressionOptions& options); bool deleteFiles(const QVariantList& files); @@ -68,6 +69,7 @@ QDir m_workDir; QStringList m_writtenFiles; ArchiveRead m_archiveReadDisk; + bool m_abortOperation; }; #endif // LIBARCHIVEHANDLER_H -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
