Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2014-11-11 01:08:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2014-10-07 15:58:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2014-11-11 01:08:36.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 2 17:46:38 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.4.0 + * Fix build with Qt 5.4 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php + +------------------------------------------------------------------- Old: ---- attica-5.3.0.tar.xz New: ---- attica-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.rsenIa/_old 2014-11-11 01:08:38.000000000 +0100 +++ /var/tmp/diff_new_pack.rsenIa/_new 2014-11-11 01:08:38.000000000 +0100 @@ -21,7 +21,7 @@ %define _libname KF5Attica Name: attica-qt5 -Version: 5.3.0 +Version: 5.4.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1+ @@ -30,7 +30,7 @@ Source: %{rname}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.3.0 +BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ attica-5.3.0.tar.xz -> attica-5.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/CMakeLists.txt new/attica-5.4.0/CMakeLists.txt --- old/attica-5.3.0/CMakeLists.txt 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/CMakeLists.txt 2014-10-31 21:14:37.000000000 +0100 @@ -3,7 +3,7 @@ project(Attica) # ECM setup -find_package(ECM 1.3.0 REQUIRED NO_MODULE) +find_package(ECM 1.4.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,7 +15,7 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.3.0") # handled by release scripts +set(KF5_VERSION "5.4.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX ATTICA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/deletejob.h new/attica-5.4.0/src/deletejob.h --- old/attica-5.3.0/src/deletejob.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/deletejob.h 2014-10-31 21:14:37.000000000 +0100 @@ -40,7 +40,7 @@ DeleteJob(PlatformDependent *internals, const QNetworkRequest &request); private: - virtual QNetworkReply *executeRequest(); + QNetworkReply *executeRequest() Q_DECL_OVERRIDE; const QNetworkRequest m_request; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/downloaddescription.cpp new/attica-5.4.0/src/downloaddescription.cpp --- old/attica-5.3.0/src/downloaddescription.cpp 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/downloaddescription.cpp 2014-10-31 21:14:37.000000000 +0100 @@ -83,6 +83,16 @@ return d->id; } +QString Attica::DownloadDescription::category() const +{ + return d->category; +} + +int DownloadDescription::id() const +{ + return d->id; +} + void DownloadDescription::setId(int id) { d->id = id; @@ -98,6 +108,11 @@ return d->distributionType; } +QString Attica::DownloadDescription::distributionType() const +{ + return d->distributionType; +} + void DownloadDescription::setDistributionType(const QString &distributionType) { d->distributionType = distributionType; @@ -108,6 +123,11 @@ return d->hasPrice; } +bool Attica::DownloadDescription::hasPrice() const +{ + return d->hasPrice; +} + void DownloadDescription::setHasPrice(bool hasPrice) { d->hasPrice = hasPrice; @@ -118,6 +138,11 @@ return d->type; } +Attica::DownloadDescription::Type DownloadDescription::type() const +{ + return d->type; +} + void DownloadDescription::setType(Attica::DownloadDescription::Type type) { d->type = type; @@ -142,6 +167,11 @@ return d->link; } +QString Attica::DownloadDescription::link() const +{ + return d->link; +} + void DownloadDescription::setLink(const QString &link) { d->link = link; @@ -152,6 +182,11 @@ return d->name; } +QString Attica::DownloadDescription::name() const +{ + return d->name; +} + void DownloadDescription::setName(const QString &name) { d->name = name; @@ -162,6 +197,11 @@ return d->priceAmount; } +QString Attica::DownloadDescription::priceAmount() const +{ + return d->priceAmount; +} + void DownloadDescription::setPriceAmount(const QString &priceAmount) { d->priceAmount = priceAmount; @@ -172,6 +212,11 @@ return d->priceReason; } +QString Attica::DownloadDescription::priceReason() const +{ + return d->priceReason; +} + void Attica::DownloadDescription::setPriceReason(const QString &priceReason) { d->priceReason = priceReason; @@ -182,6 +227,11 @@ return d->size; } +uint Attica::DownloadDescription::size() const +{ + return d->size; +} + void Attica::DownloadDescription::setSize(uint size) { d->size = size; @@ -192,6 +242,11 @@ return d->gpgFingerprint; } +QString Attica::DownloadDescription::gpgFingerprint() const +{ + return d->gpgFingerprint; +} + void Attica::DownloadDescription::setGpgFingerprint(const QString &fingerprint) { d->gpgFingerprint = fingerprint; @@ -202,6 +257,11 @@ return d->gpgSignature; } +QString Attica::DownloadDescription::gpgSignature() const +{ + return d->gpgSignature; +} + void Attica::DownloadDescription::setGpgSignature(const QString &signature) { d->gpgSignature = signature; @@ -212,6 +272,11 @@ return d->packageName; } +QString Attica::DownloadDescription::packageName() const +{ + return d->packageName; +} + void Attica::DownloadDescription::setPackageName(const QString &packageName) { d->packageName = packageName; @@ -221,6 +286,11 @@ { return d->repository; } + +QString Attica::DownloadDescription::repository() const +{ + return d->repository; +} void Attica::DownloadDescription::setRepository(const QString &repository) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/downloaddescription.h new/attica-5.4.0/src/downloaddescription.h --- old/attica-5.3.0/src/downloaddescription.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/downloaddescription.h 2014-10-31 21:14:37.000000000 +0100 @@ -52,21 +52,37 @@ The id of the description - as one Content can have multiple download descriptions associated. This will simply be 1, 2, ... */ - int id(); - Attica::DownloadDescription::Type type(); + Q_DECL_DEPRECATED int id(); + int id() const; + + // TODO KF6 remove deprecated methods. + Q_DECL_DEPRECATED Attica::DownloadDescription::Type type(); + Attica::DownloadDescription::Type type() const; Q_DECL_DEPRECATED bool isDownloadtypLink(); - bool hasPrice(); - QString category(); - QString name(); - QString link(); - QString distributionType(); - QString priceReason(); - QString priceAmount(); - uint size(); - QString gpgFingerprint(); - QString gpgSignature(); - QString packageName(); - QString repository(); + Q_DECL_DEPRECATED bool hasPrice(); + bool hasPrice() const; + Q_DECL_DEPRECATED QString category(); + QString category() const; + Q_DECL_DEPRECATED QString name(); + QString name() const; + Q_DECL_DEPRECATED QString link(); + QString link() const; + Q_DECL_DEPRECATED QString distributionType(); + QString distributionType() const; + Q_DECL_DEPRECATED QString priceReason(); + QString priceReason() const; + Q_DECL_DEPRECATED QString priceAmount(); + QString priceAmount() const; + Q_DECL_DEPRECATED uint size(); + uint size() const; + Q_DECL_DEPRECATED QString gpgFingerprint(); + QString gpgFingerprint() const; + Q_DECL_DEPRECATED QString gpgSignature(); + QString gpgSignature() const; + Q_DECL_DEPRECATED QString packageName(); + QString packageName() const; + Q_DECL_DEPRECATED QString repository(); + QString repository() const; void setId(int id); void setType(Attica::DownloadDescription::Type type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/getjob.h new/attica-5.4.0/src/getjob.h --- old/attica-5.3.0/src/getjob.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/getjob.h 2014-10-31 21:14:37.000000000 +0100 @@ -40,7 +40,7 @@ GetJob(PlatformDependent *internals, const QNetworkRequest &request); private: - virtual QNetworkReply *executeRequest(); + QNetworkReply *executeRequest() Q_DECL_OVERRIDE; const QNetworkRequest m_request; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/itemjob.h new/attica-5.4.0/src/itemjob.h --- old/attica-5.3.0/src/itemjob.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/itemjob.h 2014-10-31 21:14:37.000000000 +0100 @@ -42,7 +42,7 @@ private: ItemJob(PlatformDependent *, const QNetworkRequest &request); - virtual void parse(const QString &xml); + void parse(const QString &xml) Q_DECL_OVERRIDE; T m_item; friend class Attica::Provider; }; @@ -55,7 +55,7 @@ private: ItemDeleteJob(PlatformDependent *, const QNetworkRequest &request); - virtual void parse(const QString &xml); + void parse(const QString &xml) Q_DECL_OVERRIDE; T m_item; friend class Attica::Provider; }; @@ -70,7 +70,7 @@ ItemPostJob(PlatformDependent *internals, const QNetworkRequest &request, QIODevice *data); ItemPostJob(PlatformDependent *internals, const QNetworkRequest &request, const StringMap ¶meters = StringMap()); - virtual void parse(const QString &xml); + void parse(const QString &xml) Q_DECL_OVERRIDE; T m_item; friend class Attica::Provider; }; @@ -85,7 +85,7 @@ ItemPutJob(PlatformDependent *internals, const QNetworkRequest &request, QIODevice *data); ItemPutJob(PlatformDependent *internals, const QNetworkRequest &request, const StringMap ¶meters = StringMap()); - virtual void parse(const QString &xml); + void parse(const QString &xml) Q_DECL_OVERRIDE; T m_item; friend class Attica::Provider; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/knowledgebaseentry.h new/attica-5.4.0/src/knowledgebaseentry.h --- old/attica-5.3.0/src/knowledgebaseentry.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/knowledgebaseentry.h 2014-10-31 21:14:37.000000000 +0100 @@ -27,6 +27,7 @@ #include <QtCore/QDateTime> #include <QtCore/QSharedDataPointer> +#include <QtCore/QMap> #include <QtCore/QUrl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/listjob.h new/attica-5.4.0/src/listjob.h --- old/attica-5.3.0/src/listjob.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/listjob.h 2014-10-31 21:14:37.000000000 +0100 @@ -40,7 +40,7 @@ typename T::List itemList() const; protected: - virtual void parse(const QString &xml); + void parse(const QString &xml) Q_DECL_OVERRIDE; private: ListJob(PlatformDependent *internals, const QNetworkRequest &request); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/postjob.h new/attica-5.4.0/src/postjob.h --- old/attica-5.3.0/src/postjob.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/postjob.h 2014-10-31 21:14:37.000000000 +0100 @@ -46,8 +46,8 @@ PostJob(PlatformDependent *internals, const QNetworkRequest &request, const QByteArray &byteArray); private: - virtual QNetworkReply *executeRequest(); - virtual void parse(const QString &); + QNetworkReply *executeRequest() Q_DECL_OVERRIDE; + void parse(const QString &) Q_DECL_OVERRIDE; QIODevice *m_ioDevice; QByteArray m_byteArray; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/provider.h new/attica-5.4.0/src/provider.h --- old/attica-5.3.0/src/provider.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/provider.h 2014-10-31 21:14:37.000000000 +0100 @@ -77,7 +77,7 @@ /** * The Provider class represents one Open Collaboration Service provider. - * Use the ProviderManager to instanciate a Provider. + * Use the ProviderManager to instantiate a Provider. * * Accessing functions of the Provider returns a Job class that * takes care of accessing the server and parsing the result. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/providermanager.cpp new/attica-5.4.0/src/providermanager.cpp --- old/attica-5.3.0/src/providermanager.cpp 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/providermanager.cpp 2014-10-31 21:14:37.000000000 +0100 @@ -33,6 +33,7 @@ #include <QtCore/QProcess> #include <QtNetwork/QAuthenticator> #include <QtNetwork/QNetworkReply> +#include <QtNetwork/QNetworkProxy> #if QT_VERSION >= 0x050000 #include <QtCore/QXmlStreamReader> #else @@ -217,6 +218,7 @@ void ProviderManager::parseProviderFile(const QString &xmlString, const QString &url) { + Q_UNUSED(url) QXmlStreamReader xml(xmlString); while (!xml.atEnd() && xml.readNext()) { if (xml.isStartElement() && xml.name() == QLatin1String("provider")) { @@ -348,6 +350,8 @@ void ProviderManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) { + Q_UNUSED(proxy) + Q_UNUSED(authenticator) } void ProviderManager::initNetworkAccesssManager() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/putjob.h new/attica-5.4.0/src/putjob.h --- old/attica-5.3.0/src/putjob.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/putjob.h 2014-10-31 21:14:37.000000000 +0100 @@ -46,8 +46,8 @@ PutJob(PlatformDependent *internals, const QNetworkRequest &request, const QByteArray &byteArray); private: - virtual QNetworkReply *executeRequest(); - virtual void parse(const QString &); + QNetworkReply *executeRequest() Q_DECL_OVERRIDE; + void parse(const QString &) Q_DECL_OVERRIDE; QIODevice *m_ioDevice; QByteArray m_byteArray; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/qtplatformdependent.cpp new/attica-5.4.0/src/qtplatformdependent.cpp --- old/attica-5.3.0/src/qtplatformdependent.cpp 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/qtplatformdependent.cpp 2014-10-31 21:14:37.000000000 +0100 @@ -49,7 +49,7 @@ } } -void QtPlatformDependent::setNetworkAccessManager(QNetworkAccessManager *nam) +void QtPlatformDependent::setNam(QNetworkAccessManager *nam) { if (!nam) { return; @@ -108,11 +108,14 @@ void QtPlatformDependent::enableProvider(const QUrl &baseUrl, bool enabled) const { + Q_UNUSED(baseUrl) + Q_UNUSED(enabled) qWarning() << "attica-qt does not support disabling of providers yet"; } bool QtPlatformDependent::isEnabled(const QUrl &baseUrl) const { + Q_UNUSED(baseUrl) return true; } @@ -170,6 +173,9 @@ bool Attica::QtPlatformDependent::askForCredentials(const QUrl &baseUrl, QString &user, QString &password) { + Q_UNUSED(baseUrl) + Q_UNUSED(user) + Q_UNUSED(password) return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/src/qtplatformdependent_p.h new/attica-5.4.0/src/qtplatformdependent_p.h --- old/attica-5.3.0/src/qtplatformdependent_p.h 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/src/qtplatformdependent_p.h 2014-10-31 21:14:37.000000000 +0100 @@ -23,8 +23,8 @@ */ -#ifndef ATTICA_QTPLATFORMDEPENDENT_H -#define ATTICA_QTPLATFORMDEPENDENT_H +#ifndef ATTICA_QTPLATFORMDEPENDENT_P_H +#define ATTICA_QTPLATFORMDEPENDENT_P_H #include "platformdependent_v2.h" @@ -43,25 +43,25 @@ QtPlatformDependent(); virtual ~QtPlatformDependent(); - virtual void setNetworkAccessManager(QNetworkAccessManager *nam); - virtual QNetworkAccessManager *nam(); + void setNam(QNetworkAccessManager *nam) Q_DECL_OVERRIDE; + QNetworkAccessManager *nam() Q_DECL_OVERRIDE; - virtual QList<QUrl> getDefaultProviderFiles() const; - virtual void addDefaultProviderFile(const QUrl &url); - virtual void removeDefaultProviderFile(const QUrl &url); - virtual void enableProvider(const QUrl &baseUrl, bool enabled) const; - virtual bool isEnabled(const QUrl &baseUrl) const; - - virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data); - virtual QNetworkReply *post(const QNetworkRequest &request, QIODevice *data); - virtual QNetworkReply *get(const QNetworkRequest &request); - virtual bool hasCredentials(const QUrl &baseUrl) const; - virtual bool saveCredentials(const QUrl &baseUrl, const QString &user, const QString &password); - virtual bool loadCredentials(const QUrl &baseUrl, QString &user, QString &password); - virtual bool askForCredentials(const QUrl &baseUrl, QString &user, QString &password); - virtual QNetworkReply *deleteResource(const QNetworkRequest &request); - virtual QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data); - virtual QNetworkReply *put(const QNetworkRequest &request, QIODevice *data); + QList<QUrl> getDefaultProviderFiles() const Q_DECL_OVERRIDE; + void addDefaultProviderFile(const QUrl &url) Q_DECL_OVERRIDE; + void removeDefaultProviderFile(const QUrl &url) Q_DECL_OVERRIDE; + void enableProvider(const QUrl &baseUrl, bool enabled) const Q_DECL_OVERRIDE; + bool isEnabled(const QUrl &baseUrl) const Q_DECL_OVERRIDE; + + QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) Q_DECL_OVERRIDE; + QNetworkReply *post(const QNetworkRequest &request, QIODevice *data) Q_DECL_OVERRIDE; + QNetworkReply *get(const QNetworkRequest &request) Q_DECL_OVERRIDE; + bool hasCredentials(const QUrl &baseUrl) const Q_DECL_OVERRIDE; + bool saveCredentials(const QUrl &baseUrl, const QString &user, const QString &password) Q_DECL_OVERRIDE; + bool loadCredentials(const QUrl &baseUrl, QString &user, QString &password) Q_DECL_OVERRIDE; + bool askForCredentials(const QUrl &baseUrl, QString &user, QString &password) Q_DECL_OVERRIDE; + QNetworkReply *deleteResource(const QNetworkRequest &request) Q_DECL_OVERRIDE; + QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data) Q_DECL_OVERRIDE; + QNetworkReply *put(const QNetworkRequest &request, QIODevice *data) Q_DECL_OVERRIDE; private: QMutex m_accessMutex; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.3.0/tests/projecttest/projecttest.cpp new/attica-5.4.0/tests/projecttest/projecttest.cpp --- old/attica-5.3.0/tests/projecttest/projecttest.cpp 2014-10-03 19:53:02.000000000 +0200 +++ new/attica-5.4.0/tests/projecttest/projecttest.cpp 2014-10-31 21:14:37.000000000 +0100 @@ -384,7 +384,7 @@ void ProjectTest::selectedBuildServiceChanged(QListWidgetItem *current, QListWidgetItem *previous) { - + Q_UNUSED(previous) qDebug() << "current item changed to " << current->data(Qt::UserRole).toString(); m_editor->targets->clear(); QList<Target> targetlist = m_buildServices[current->data(Qt::UserRole).toString()].targets(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
