Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Leap:15.2 checked in at 2020-02-16 18:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/attica-qt5 (Old) and /work/SRC/openSUSE:Leap:15.2/.attica-qt5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Sun Feb 16 18:26:16 2020 rev:50 rq:773886 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/attica-qt5/attica-qt5.changes 2020-01-19 15:47:49.869714892 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.attica-qt5.new.26092/attica-qt5.changes 2020-02-16 18:26:22.246656757 +0100 @@ -1,0 +2,15 @@ +Sun Feb 2 18:06:38 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:24 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Make it compile with qt5.15 + +------------------------------------------------------------------- Old: ---- attica-5.66.0.tar.xz attica-5.66.0.tar.xz.sig New: ---- attica-5.67.0.tar.xz attica-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.lobtE1/_old 2020-02-16 18:26:22.506656894 +0100 +++ /var/tmp/diff_new_pack.lobtE1/_new 2020-02-16 18:26:22.510656896 +0100 @@ -19,7 +19,7 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.66 +%define _tar_path 5.67 # 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.66.0 +Version: 5.67.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1-or-later @@ -44,9 +44,9 @@ BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Core) >= 5.11.0 -BuildRequires: cmake(Qt5Network) >= 5.11.0 -BuildRequires: cmake(Qt5Widgets) >= 5.11.0 +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5Network) >= 5.12.0 +BuildRequires: cmake(Qt5Widgets) >= 5.12.0 %description Attica is a library to access Open Collaboration Service servers. @@ -65,9 +65,9 @@ Summary: Open Collaboration Service client library - development files Group: Development/Libraries/C and C++ Requires: lib%{_libname}%{sonum} = %{version} -Requires: cmake(Qt5Core) >= 5.11.0 -Requires: cmake(Qt5Network) >= 5.11.0 -Requires: cmake(Qt5Widgets) >= 5.11.0 +Requires: cmake(Qt5Core) >= 5.12.0 +Requires: cmake(Qt5Network) >= 5.12.0 +Requires: cmake(Qt5Widgets) >= 5.12.0 %description -n attica-qt5-devel Development files for attica, Attica a library to access Open Collaboration Service servers. @@ -77,7 +77,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ attica-5.66.0.tar.xz -> attica-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.66.0/CMakeLists.txt new/attica-5.67.0/CMakeLists.txt --- old/attica-5.66.0/CMakeLists.txt 2020-01-04 00:09:00.000000000 +0100 +++ new/attica-5.67.0/CMakeLists.txt 2020-02-01 09:58:30.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts project(Attica VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.66.0/src/atticabasejob.cpp new/attica-5.67.0/src/atticabasejob.cpp --- old/attica-5.66.0/src/atticabasejob.cpp 2020-01-04 00:09:00.000000000 +0100 +++ new/attica-5.67.0/src/atticabasejob.cpp 2020-02-01 09:58:30.000000000 +0100 @@ -48,7 +48,13 @@ bool redirection(QUrl &newUrl) const { - if (m_reply == nullptr || m_reply->error() != QNetworkReply::NoError) { + if (m_reply == nullptr || + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + m_reply->error() + #else + m_reply->networkError() + #endif + != QNetworkReply::NoError) { return false; } @@ -90,7 +96,13 @@ return; } - bool error = (d->m_reply->error() != QNetworkReply::NoError); + bool error = ( + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + d->m_reply->error() + #else + d->m_reply->networkError() + #endif + != QNetworkReply::NoError); // handle redirections automatically QUrl newUrl; @@ -121,7 +133,11 @@ } } else { d->m_metadata.setError(Metadata::NetworkError); +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) d->m_metadata.setStatusCode(d->m_reply->error()); +#else + d->m_metadata.setStatusCode(d->m_reply->networkError()); +#endif d->m_metadata.setStatusString(d->m_reply->errorString()); } emit finished(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.66.0/src/providermanager.cpp new/attica-5.67.0/src/providermanager.cpp --- old/attica-5.66.0/src/providermanager.cpp 2020-01-04 00:09:00.000000000 +0100 +++ new/attica-5.67.0/src/providermanager.cpp 2020-02-01 09:58:30.000000000 +0100 @@ -159,8 +159,13 @@ void ProviderManager::fileFinished(const QString &url) { QNetworkReply *reply = d->m_downloads.take(url); +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) if (reply->error()) Q_EMIT failedToLoad(QUrl(url), reply->error()); +#else + if (reply->networkError()) + Q_EMIT failedToLoad(QUrl(url), reply->networkError()); +#endif else parseProviderFile(QLatin1String(reply->readAll()), QUrl(url)); reply->deleteLater();
