Hello community, here is the log from the commit of package kget for openSUSE:Factory checked in at 2014-03-18 17:17:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kget (Old) and /work/SRC/openSUSE:Factory/.kget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kget" Changes: -------- --- /work/SRC/openSUSE:Factory/kget/kget.changes 2014-02-20 07:58:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kget.new/kget.changes 2014-03-18 17:17:30.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 13 20:49:33 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 11:33:31 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- kget-4.12.2.tar.xz New: ---- kget-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kget.spec ++++++ --- /var/tmp/diff_new_pack.z0l82M/_old 2014-03-18 17:17:31.000000000 +0100 +++ /var/tmp/diff_new_pack.z0l82M/_new 2014-03-18 17:17:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: kget -Version: 4.12.2 +Version: 4.12.90 Release: 0 Summary: Download Manager License: GPL-2.0+ @@ -31,8 +31,6 @@ BuildRequires: libktorrent-devel BuildRequires: libnepomukwidgets-devel BuildRequires: libqca2-devel -BuildRequires: nepomuk-core-devel -BuildRequires: shared-desktop-ontologies-devel BuildRequires: sqlite-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -72,7 +70,6 @@ %{_kde4_servicetypesdir}/*.desktop %{_kde4_servicesdir}/*.desktop %{_kde4_servicesdir}/ServiceMenus/*.desktop -%{_datadir}/ontology/kde/kget_history.* %{_datadir}/dbus-1/services/org.kde.kget.service %{_kde4_configkcfgdir}/*.kcfg %{_kde4_appsdir}/kwebkitpart/ ++++++ kget-4.12.2.tar.xz -> kget-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kget-4.12.2/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp new/kget-4.12.90/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp --- old/kget-4.12.2/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp 2014-01-27 19:50:28.000000000 +0100 +++ new/kget-4.12.90/transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp 2014-02-23 20:20:51.000000000 +0100 @@ -330,7 +330,7 @@ case 1: return i18n("Which client the peer is using"); case 2: return i18n("Download speed"); case 3: return i18n("Upload speed"); - case 4: return i18n("Whether or not the peer has choked us. If we are choked, the peer will not send us any data."); + case 4: return i18n("Whether or not the peer has choked us. If we are choked, the peer will not send us any data."); case 5: return i18n("Snubbed means the peer has not sent us any data in the last 2 minutes"); case 6: return i18n("How much of the torrent's data the peer has"); case 7: return i18n("Whether or not the peer has DHT enabled"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kget-4.12.2/transfer-plugins/bittorrent/btsettingswidget.ui new/kget-4.12.90/transfer-plugins/bittorrent/btsettingswidget.ui --- old/kget-4.12.2/transfer-plugins/bittorrent/btsettingswidget.ui 2014-01-27 19:50:28.000000000 +0100 +++ new/kget-4.12.90/transfer-plugins/bittorrent/btsettingswidget.ui 2014-02-23 20:20:51.000000000 +0100 @@ -134,7 +134,7 @@ <item row="1" column="0"> <widget class="QLabel" name="tempFolderLabel"> <property name="text"> - <string>Default temporary folder</string> + <string>Default temporary folder:</string> </property> </widget> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kget-4.12.2/transfer-plugins/kio/transferKio.cpp new/kget-4.12.90/transfer-plugins/kio/transferKio.cpp --- old/kget-4.12.2/transfer-plugins/kio/transferKio.cpp 2014-01-27 19:50:28.000000000 +0100 +++ new/kget-4.12.90/transfer-plugins/kio/transferKio.cpp 2014-02-23 20:20:51.000000000 +0100 @@ -14,6 +14,8 @@ #include "core/signature.h" #include "settings.h" +#include <utime.h> + #include <kiconloader.h> #include <kio/scheduler.h> #include <KIO/DeleteJob> @@ -172,7 +174,8 @@ // when slotResult gets called, the m_copyjob has already been deleted! m_copyjob=0; - Transfer::ChangesFlags flags = Tc_Status; + // If it is an ftp file, there's still work to do + Transfer::ChangesFlags flags = (m_source.protocol() != "ftp") ? Tc_Status : Tc_None; if (status() == Job::Finished) { if (!m_totalSize) { //downloaded elsewhere already, e.g. Konqueror @@ -195,6 +198,12 @@ } } + if (m_source.protocol() == "ftp") { + KIO::StatJob * statJob = KIO::stat(m_source); + connect(statJob, SIGNAL(result(KJob*)), this, SLOT(slotStatResult(KJob*))); + statJob->start(); + } + setTransferChange(flags, true); } @@ -275,6 +284,24 @@ } } +void TransferKio::slotStatResult(KJob* kioJob) +{ + KIO::StatJob * statJob = qobject_cast<KIO::StatJob *>(kioJob); + + if (!statJob->error()) { + const KIO::UDSEntry entryResult = statJob->statResult(); + struct utimbuf time; + + time.modtime = entryResult.numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME); + time.actime = QDateTime::currentDateTime().toTime_t(); + utime(m_dest.toLocalFile().toUtf8().constData(), &time); + } + + setStatus(Job::Finished); + setTransferChange(Tc_Status, true); +} + + bool TransferKio::repair(const KUrl &file) { Q_UNUSED(file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kget-4.12.2/transfer-plugins/kio/transferKio.h new/kget-4.12.90/transfer-plugins/kio/transferKio.h --- old/kget-4.12.2/transfer-plugins/kio/transferKio.h 2014-01-27 19:50:28.000000000 +0100 +++ new/kget-4.12.90/transfer-plugins/kio/transferKio.h 2014-02-23 20:20:51.000000000 +0100 @@ -70,6 +70,7 @@ void slotSpeed( KJob * kioJob, unsigned long bytes_per_second ); void newDestResult(KJob *result); void slotVerified(bool isVerified); + void slotStatResult(KJob * kioJob); private: Verifier *m_verifier; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kget-4.12.2/transfer-plugins/multisegmentkio/transfermultisegkio.cpp new/kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.cpp --- old/kget-4.12.2/transfer-plugins/multisegmentkio/transfermultisegkio.cpp 2014-01-27 19:50:28.000000000 +0100 +++ new/kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.cpp 2014-02-23 20:20:51.000000000 +0100 @@ -19,6 +19,8 @@ #include "core/verifier.h" #include "core/signature.h" +#include <utime.h> + #include <kiconloader.h> #include <KIO/CopyJob> #include <KIO/NetAccess> @@ -189,7 +191,13 @@ } } if (change & Tc_Status) { - setStatus(m_dataSourceFactory->status()); + if ((m_dataSourceFactory->status() == Job::Finished) && m_source.protocol() == "ftp") { + KIO::StatJob * statJob = KIO::stat(m_source); + connect(statJob, SIGNAL(result(KJob*)), this, SLOT(slotStatResult(KJob*))); + statJob->start(); + } else { + setStatus(m_dataSourceFactory->status()); + } if (m_fileModel) { QModelIndex statusIndex = m_fileModel->index(m_dest, FileItem::Status); @@ -254,6 +262,23 @@ } } +void TransferMultiSegKio::slotStatResult(KJob* kioJob) +{ + KIO::StatJob * statJob = qobject_cast<KIO::StatJob *>(kioJob); + + if (!statJob->error()) { + const KIO::UDSEntry entryResult = statJob->statResult(); + struct utimbuf time; + + time.modtime = entryResult.numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME); + time.actime = QDateTime::currentDateTime().toTime_t(); + utime(m_dest.toLocalFile().toUtf8().constData(), &time); + } + + setStatus(Job::Finished); + setTransferChange(Tc_Status, true); +} + void TransferMultiSegKio::slotSearchUrls(const QList<KUrl> &urls) { kDebug(5001) << "Found " << urls.size() << " urls."; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kget-4.12.2/transfer-plugins/multisegmentkio/transfermultisegkio.h new/kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.h --- old/kget-4.12.2/transfer-plugins/multisegmentkio/transfermultisegkio.h 2014-01-27 19:50:28.000000000 +0100 +++ new/kget-4.12.90/transfer-plugins/multisegmentkio/transfermultisegkio.h 2014-02-23 20:20:51.000000000 +0100 @@ -82,6 +82,7 @@ void slotSearchUrls(const QList<KUrl> &urls); void slotRename(const KUrl &oldUrl, const KUrl &newUrl); void slotVerified(bool isVerified); + void slotStatResult(KJob * kioJob); private: bool m_movingFile; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
