Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2019-11-12 11:41:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Tue Nov 12 11:41:14 2019 rev:73 rq:747077 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2019-10-14 13:32:31.874800283 +0200 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new.2990/attica-qt5.changes 2019-11-12 11:41:16.310464218 +0100 @@ -1,0 +2,11 @@ +Sun Nov 3 15:46:43 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.64.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.64.0.php +- Changes since 5.63.0: + * Use ECMGenerateExportHeader to manage deprecated API better + * Add some std::move in setter functions + +------------------------------------------------------------------- Old: ---- attica-5.63.0.tar.xz attica-5.63.0.tar.xz.sig New: ---- attica-5.64.0.tar.xz attica-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.kmbKG0/_old 2019-11-12 11:41:17.994465990 +0100 +++ /var/tmp/diff_new_pack.kmbKG0/_new 2019-11-12 11:41:18.006466003 +0100 @@ -19,7 +19,7 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.63 +%define _tar_path 5.64 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -27,7 +27,7 @@ # Only needed for the package signature condition %bcond_without lang Name: attica-qt5 -Version: 5.63.0 +Version: 5.64.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1-or-later ++++++ attica-5.63.0.tar.xz -> attica-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/CMakeLists.txt new/attica-5.64.0/CMakeLists.txt --- old/attica-5.63.0/CMakeLists.txt 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/CMakeLists.txt 2019-11-02 12:41:29.000000000 +0100 @@ -1,25 +1,28 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.63.0") # handled by release scripts +set(KF5_VERSION "5.64.0") # handled by release scripts project(Attica VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.63.0 NO_MODULE) +find_package(ECM 5.64.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -include(GenerateExportHeader) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + +include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) # Used to create CMake config files include(ECMQtDeclareLoggingCategory) include(ECMAddQch) -include(KDEInstallDirs) # Used to set installation paths -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(KDECMakeSettings) + +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -41,6 +44,7 @@ # Enable static build option(ATTICA_STATIC_BUILD "Build a static library" Off) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/docs/Doxyfile.local new/attica-5.64.0/docs/Doxyfile.local --- old/attica-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/attica-5.64.0/docs/Doxyfile.local 2019-11-02 12:41:29.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides file + +# define so that deprecated API is not skipped +PREDEFINED += \ + "ATTICA_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "ATTICA_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "ATTICA_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/CMakeLists.txt new/attica-5.64.0/src/CMakeLists.txt --- old/attica-5.63.0/src/CMakeLists.txt 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/CMakeLists.txt 2019-11-02 12:41:29.000000000 +0100 @@ -88,7 +88,14 @@ ) add_library(KF5::Attica ALIAS KF5Attica) -generate_export_header(KF5Attica BASE_NAME Attica) +ecm_generate_export_header(KF5Attica + BASE_NAME Attica + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 0.2 5.4 5.23 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_link_libraries(KF5Attica PUBLIC @@ -185,6 +192,7 @@ ATTICA_EXPORT ATTICA_DEPRECATED ATTICA_DEPRECATED_EXPORT + "ATTICA_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/comment.cpp new/attica-5.64.0/src/comment.cpp --- old/attica-5.63.0/src/comment.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/comment.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -156,7 +156,7 @@ void Comment::setChildren(QList<Comment> children) { - d->m_children = children; + d->m_children = std::move(children); // TODO KF6 Make QList const & and remove the std::move } QList<Comment> Comment::children() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/content.cpp new/attica-5.64.0/src/content.cpp --- old/attica-5.63.0/src/content.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/content.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -317,7 +317,7 @@ void Attica::Content::setIcons(QList<Icon> icons) { - d->m_icons = icons; + d->m_icons = std::move(icons); // TODO KF6 Make QList const & and remove the std::move } QList<QUrl> Attica::Content::videos() @@ -327,7 +327,7 @@ void Attica::Content::setVideos(QList<QUrl> videos) { - d->m_videos = videos; + d->m_videos = std::move(videos); } QStringList Attica::Content::tags() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/downloaddescription.cpp new/attica-5.64.0/src/downloaddescription.cpp --- old/attica-5.63.0/src/downloaddescription.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/downloaddescription.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -71,15 +71,19 @@ { } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::category() { return d->category; } +#endif +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) int DownloadDescription::id() { return d->id; } +#endif QString Attica::DownloadDescription::category() const { @@ -101,10 +105,12 @@ d->category = category; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::distributionType() { return d->distributionType; } +#endif QString Attica::DownloadDescription::distributionType() const { @@ -116,10 +122,12 @@ d->distributionType = distributionType; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) bool Attica::DownloadDescription::hasPrice() { return d->hasPrice; } +#endif bool Attica::DownloadDescription::hasPrice() const { @@ -131,10 +139,12 @@ d->hasPrice = hasPrice; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) Attica::DownloadDescription::Type DownloadDescription::type() { return d->type; } +#endif Attica::DownloadDescription::Type DownloadDescription::type() const { @@ -146,11 +156,14 @@ d->type = type; } +#if ATTICA_BUILD_DEPRECATED_SINCE(0, 2) bool Attica::DownloadDescription::isDownloadtypLink() { return d->type == Attica::DownloadDescription::LinkDownload; } +#endif +#if ATTICA_BUILD_DEPRECATED_SINCE(0, 2) void DownloadDescription::setDownloadtypLink(bool isLink) { if (isLink) { @@ -159,11 +172,14 @@ d->type = Attica::DownloadDescription::FileDownload; } } +#endif +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::link() { return d->link; } +#endif QString Attica::DownloadDescription::link() const { @@ -175,10 +191,12 @@ d->link = link; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::name() { return d->name; } +#endif QString Attica::DownloadDescription::name() const { @@ -190,10 +208,12 @@ d->name = name; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::priceAmount() { return d->priceAmount; } +#endif QString Attica::DownloadDescription::priceAmount() const { @@ -205,10 +225,12 @@ d->priceAmount = priceAmount; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::priceReason() { return d->priceReason; } +#endif QString Attica::DownloadDescription::priceReason() const { @@ -220,10 +242,12 @@ d->priceReason = priceReason; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) uint Attica::DownloadDescription::size() { return d->size; } +#endif uint Attica::DownloadDescription::size() const { @@ -235,10 +259,12 @@ d->size = size; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::gpgFingerprint() { return d->gpgFingerprint; } +#endif QString Attica::DownloadDescription::gpgFingerprint() const { @@ -250,10 +276,12 @@ d->gpgFingerprint = fingerprint; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::gpgSignature() { return d->gpgSignature; } +#endif QString Attica::DownloadDescription::gpgSignature() const { @@ -265,10 +293,12 @@ d->gpgSignature = signature; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::packageName() { return d->packageName; } +#endif QString Attica::DownloadDescription::packageName() const { @@ -280,10 +310,12 @@ d->packageName = packageName; } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 4) QString Attica::DownloadDescription::repository() { return d->repository; } +#endif QString Attica::DownloadDescription::repository() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/downloaddescription.h new/attica-5.64.0/src/downloaddescription.h --- old/attica-5.63.0/src/downloaddescription.h 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/downloaddescription.h 2019-11-02 12:41:29.000000000 +0100 @@ -52,36 +52,80 @@ The id of the description - as one Content can have multiple download descriptions associated. This will simply be 1, 2, ... */ - Q_DECL_DEPRECATED int id(); int id() const; +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + int id(); +#endif - // TODO KF6 remove deprecated methods. - Q_DECL_DEPRECATED Attica::DownloadDescription::Type type(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(0, 2, "Use DownloadDescription::type()") + Attica::DownloadDescription::Type type(); +#endif Attica::DownloadDescription::Type type() const; - Q_DECL_DEPRECATED bool isDownloadtypLink(); - Q_DECL_DEPRECATED bool hasPrice(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(0, 2) + ATTICA_DEPRECATED_VERSION(0, 2, "Use DownloadDescription::type()") + bool isDownloadtypLink(); +#endif +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + bool hasPrice(); +#endif bool hasPrice() const; - Q_DECL_DEPRECATED QString category(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString category(); +#endif QString category() const; - Q_DECL_DEPRECATED QString name(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString name(); +#endif QString name() const; - Q_DECL_DEPRECATED QString link(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString link(); +#endif QString link() const; - Q_DECL_DEPRECATED QString distributionType(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString distributionType(); +#endif QString distributionType() const; - Q_DECL_DEPRECATED QString priceReason(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString priceReason(); +#endif QString priceReason() const; - Q_DECL_DEPRECATED QString priceAmount(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString priceAmount(); +#endif QString priceAmount() const; - Q_DECL_DEPRECATED uint size(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + uint size(); +#endif uint size() const; - Q_DECL_DEPRECATED QString gpgFingerprint(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString gpgFingerprint(); +#endif QString gpgFingerprint() const; - Q_DECL_DEPRECATED QString gpgSignature(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString gpgSignature(); +#endif QString gpgSignature() const; - Q_DECL_DEPRECATED QString packageName(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString packageName(); +#endif QString packageName() const; - Q_DECL_DEPRECATED QString repository(); +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 4) + ATTICA_DEPRECATED_VERSION(5, 4, "Use const overload") + QString repository(); +#endif QString repository() const; /** * Get the list of tags for this download description @@ -91,7 +135,10 @@ void setId(int id); void setType(Attica::DownloadDescription::Type type); - Q_DECL_DEPRECATED void setDownloadtypLink(bool isLink); +#if ATTICA_ENABLE_DEPRECATED_SINCE(0, 2) + ATTICA_DEPRECATED_VERSION(0, 2, "Use DownloadDescription::setType(Attica::DownloadDescription::Type)") + void setDownloadtypLink(bool isLink); +#endif void setHasPrice(bool hasPrice); void setCategory(const QString &category); void setName(const QString &name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/forum.cpp new/attica-5.64.0/src/forum.cpp --- old/attica-5.63.0/src/forum.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/forum.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -126,7 +126,7 @@ void Forum::setChildren(QList<Forum> children) { - d->m_children = children; + d->m_children = std::move(children); // TODO KF6 Make QList const & and remove the std::move } QList<Forum> Forum::children() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/knowledgebaseentry.cpp new/attica-5.64.0/src/knowledgebaseentry.cpp --- old/attica-5.63.0/src/knowledgebaseentry.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/knowledgebaseentry.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -72,7 +72,7 @@ void KnowledgeBaseEntry::setId(QString id) { - d->m_id = id; + d->m_id = std::move(id); // TODO KF6 Make QString const & and remove the std::move } QString KnowledgeBaseEntry::id() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/provider.cpp new/attica-5.64.0/src/provider.cpp --- old/attica-5.63.0/src/provider.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/provider.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -1274,6 +1274,7 @@ return new PostJob(d->m_internals, postRequest.request(), postRequest.data()); } +#if ATTICA_BUILD_DEPRECATED_SINCE(0, 2) PostJob *Provider::voteForContent(const QString &contentId, bool positiveVote) { if (!isValid()) { @@ -1285,6 +1286,7 @@ //qCDebug(ATTICA) << "vote: " << positiveVote; return new PostJob(d->m_internals, createRequest(QLatin1String("content/vote/") + contentId), postParameters); } +#endif PostJob *Provider::voteForContent(const QString &contentId, uint rating) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/provider.h new/attica-5.64.0/src/provider.h --- old/attica-5.63.0/src/provider.h 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/provider.h 2019-11-02 12:41:29.000000000 +0100 @@ -588,13 +588,17 @@ ItemJob<DownloadItem> *downloadLink(const QString &contentId, const QString &itemId = QStringLiteral("1")); +#if ATTICA_ENABLE_DEPRECATED_SINCE(0, 2) /** Vote for a content item * This version is for the old OCS API < 1.6 * @param contentId the content which this voting is for * @param positiveVote whether the voting is positive or negative * @return the post job for this voting + * @deprecated Since 0.2, use voteForContent(const QString &, uint) */ - Q_DECL_DEPRECATED PostJob *voteForContent(const QString &contentId, bool positiveVote); + ATTICA_DEPRECATED_VERSION(0, 2, "Use Provider::voteForContent(const QString &, uint)") + PostJob *voteForContent(const QString &contentId, bool positiveVote); +#endif /** Vote for a content item * @param contentId the content which this voting is for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/providermanager.cpp new/attica-5.64.0/src/providermanager.cpp --- old/attica-5.63.0/src/providermanager.cpp 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/providermanager.cpp 2019-11-02 12:41:29.000000000 +0100 @@ -264,10 +264,12 @@ return d->m_providers.values(); } +#if ATTICA_BUILD_DEPRECATED_SINCE(5, 23) bool ProviderManager::contains(const QString &provider) const { return d->m_providers.contains(QUrl(provider)); } +#endif QList<QUrl> ProviderManager::providerFiles() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.63.0/src/providermanager.h new/attica-5.64.0/src/providermanager.h --- old/attica-5.63.0/src/providermanager.h 2019-10-06 11:32:57.000000000 +0200 +++ new/attica-5.64.0/src/providermanager.h 2019-11-02 12:41:29.000000000 +0100 @@ -147,7 +147,13 @@ */ QList<Provider> providers() const; - ATTICA_DEPRECATED bool contains(const QString &provider) const; +#if ATTICA_ENABLE_DEPRECATED_SINCE(5, 23) + /** + * @deprecated Since 5.23, use contains(const QUrl&) + */ + ATTICA_DEPRECATED_VERSION(5, 23, "Use ProviderManager::contains(const QUrl&)") + bool contains(const QString &provider) const; +#endif /** * @returns whether there's a provider with base url @p provider
