Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2021-07-15 23:59:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Thu Jul 15 23:59:07 2021 rev:93 rq:905464 version:5.84.0 Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2021-06-16 20:33:48.263014050 +0200 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new.2625/attica-qt5.changes 2021-07-15 23:59:22.341995925 +0200 @@ -1,0 +2,16 @@ +Sun Jul 4 07:45:01 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.84.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.84.0 +- Changes since 5.83.0: + * Longer timeout for the provider test + * State library license in yaml file + * Generate license compliance test + * Do the documentation thing, with @since and whatnot + * Constness fix + * Add http headers to Metadata (and set it from BaseJob) +- Only install the license files once + +------------------------------------------------------------------- Old: ---- attica-5.83.0.tar.xz attica-5.83.0.tar.xz.sig New: ---- attica-5.84.0.tar.xz attica-5.84.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.buIip7/_old 2021-07-15 23:59:22.961990939 +0200 +++ /var/tmp/diff_new_pack.buIip7/_new 2021-07-15 23:59:22.965990908 +0200 @@ -19,7 +19,7 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.83 +%define _tar_path 5.84 # 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.83.0 +Version: 5.84.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1-or-later @@ -86,8 +86,6 @@ %postun -n lib%{_libname}%{sonum} -p /sbin/ldconfig %files -%license LICENSES/* -%doc README* %{_kf5_debugdir}/attica.categories %{_kf5_debugdir}/attica.renamecategories @@ -97,7 +95,6 @@ %{_libqt5_libdir}/lib%{_libname}*.so.* %files -n attica-qt5-devel -%license LICENSES/* %{_kf5_includedir}/ %{_kf5_libdir}/cmake/KF5Attica/ %{_kf5_mkspecsdir}/qt_Attica.pri ++++++ attica-5.83.0.tar.xz -> attica-5.84.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/CMakeLists.txt new/attica-5.84.0/CMakeLists.txt --- old/attica-5.83.0/CMakeLists.txt 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/CMakeLists.txt 2021-06-19 17:51:36.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.83.0") # handled by release scripts +set(KF_VERSION "5.84.0") # handled by release scripts project(Attica VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.83.0 NO_MODULE) +find_package(ECM 5.84.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) @@ -17,6 +17,7 @@ include(KDEGitCommitHooks) include(ECMGenerateExportHeader) +include(ECMCheckOutboundLicense) include(ECMSetupVersion) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) # Used to create CMake config files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/autotests/providertest.cpp new/attica-5.84.0/autotests/providertest.cpp --- old/attica-5.83.0/autotests/providertest.cpp 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/autotests/providertest.cpp 2021-06-19 17:51:36.000000000 +0200 @@ -86,7 +86,7 @@ m_errorReceived = true; m_eventloop->quit(); }); - m_timer.singleShot(5000, this, &ProviderTest::slotTimeout); + m_timer.singleShot(30000, this, &ProviderTest::slotTimeout); m_eventloop->exec(); } @@ -152,7 +152,7 @@ ListJob<Content> *job = provider.searchContents({}, {}, Provider::Downloads); QVERIFY(job); connect(job, &BaseJob::finished, this, &ProviderTest::slotList2Result); - m_timer.singleShot(5000, this, &ProviderTest::slotTimeout); + m_timer.singleShot(30000, this, &ProviderTest::slotTimeout); job->start(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/metainfo.yaml new/attica-5.84.0/metainfo.yaml --- old/attica-5.83.0/metainfo.yaml 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/metainfo.yaml 2021-06-19 17:51:36.000000000 +0200 @@ -14,6 +14,7 @@ libraries: - qmake: Attica cmake: "KF5::Attica" + license: LGPL-2.1-only OR LGPL-3.0-only cmakename: KF5Attica public_lib: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/src/CMakeLists.txt new/attica-5.84.0/src/CMakeLists.txt --- old/attica-5.83.0/src/CMakeLists.txt 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/src/CMakeLists.txt 2021-06-19 17:51:36.000000000 +0200 @@ -5,7 +5,16 @@ configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h) -set(attica_SRCS +add_library(KF5Attica) +add_library(KF5::Attica ALIAS KF5Attica) + +set_target_properties(KF5Attica PROPERTIES + VERSION ${ATTICA_VERSION} + SOVERSION ${ATTICA_SOVERSION} + EXPORT_NAME "Attica" +) + +target_sources(KF5Attica PRIVATE accountbalance.cpp accountbalanceparser.cpp achievement.cpp @@ -78,7 +87,7 @@ topicparser.cpp ) -ecm_qt_declare_logging_category(attica_SRCS +ecm_qt_declare_logging_category(KF5Attica HEADER attica_debug.h IDENTIFIER ATTICA CATEGORY_NAME kf.attica @@ -87,14 +96,13 @@ EXPORT ATTICA ) -add_library(KF5Attica ${attica_SRCS}) -set_target_properties(KF5Attica PROPERTIES - VERSION ${ATTICA_VERSION} - SOVERSION ${ATTICA_SOVERSION} - EXPORT_NAME "Attica" +file(GLOB TEST_FILES "*.cpp" "*.h") +ecm_check_outbound_license( + LICENSES LGPL-2.1-only LGPL-3.0-only + TEST_NAME KF5Attica + FILES ${TEST_FILES} ) -add_library(KF5::Attica ALIAS KF5Attica) ecm_generate_export_header(KF5Attica BASE_NAME Attica GROUP_BASE_NAME KF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/src/atticabasejob.cpp new/attica-5.84.0/src/atticabasejob.cpp --- old/attica-5.83.0/src/atticabasejob.cpp 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/src/atticabasejob.cpp 2021-06-19 17:51:36.000000000 +0200 @@ -97,7 +97,12 @@ } } - if (!error) { + if (error) { + d->m_metadata.setError(Metadata::NetworkError); + d->m_metadata.setStatusCode(d->m_reply->error()); + d->m_metadata.setStatusString(d->m_reply->errorString()); + d->m_metadata.setHeaders(d->m_reply->rawHeaderPairs()); + } else { QByteArray data = d->m_reply->readAll(); // qCDebug(ATTICA) << "XML Returned:\n" << data; parse(QString::fromUtf8(data.constData())); @@ -106,10 +111,6 @@ } else { d->m_metadata.setError(Metadata::OcsError); } - } else { - d->m_metadata.setError(Metadata::NetworkError); - d->m_metadata.setStatusCode(d->m_reply->error()); - d->m_metadata.setStatusString(d->m_reply->errorString()); } Q_EMIT finished(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/src/metadata.cpp new/attica-5.84.0/src/metadata.cpp --- old/attica-5.83.0/src/metadata.cpp 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/src/metadata.cpp 2021-06-19 17:51:36.000000000 +0200 @@ -33,6 +33,9 @@ QString resultingId; + /// The http headers for the most recent network action in the case of a network error + QList<QNetworkReply::RawHeaderPair> headers; + Private() // values that make sense for single item jobs : error(NoError) @@ -132,3 +135,13 @@ { d->itemsPerPage = itemsPerPage; } + +QList<QNetworkReply::RawHeaderPair> Metadata::headers() const +{ + return d->headers; +} + +void Metadata::setHeaders(const QList<QNetworkReply::RawHeaderPair> &headers) +{ + d->headers = headers; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/src/metadata.h new/attica-5.84.0/src/metadata.h --- old/attica-5.83.0/src/metadata.h 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/src/metadata.h 2021-06-19 17:51:36.000000000 +0200 @@ -11,6 +11,7 @@ #include <QString> +#include <QNetworkReply> #include <QSharedDataPointer> #include "attica_export.h" @@ -73,6 +74,23 @@ QString resultingId(); void setResultingId(const QString &id); + /** + * The http headers for the most recent network action in the case of a network error + * Use this to further inspect the error condition if the OCS status code and string is + * not enough to work out precisely what has happened (for example in case of a HTTP + * 503 status, which would suggest the service is down for maintenance for an expected + * duration which might be read from the Retry-After header). + * @return The list of raw headers (equivalent to a QNetworkReply::rawHeaderPairs call) + * @since 5.83 + */ + QList<QNetworkReply::RawHeaderPair> headers() const; + /** + * Sets the http headers read by headers() + * @param headers The new list of raw headers + * @since 5.83 + */ + void setHeaders(const QList<QNetworkReply::RawHeaderPair> &headers); + private: class Private; QSharedDataPointer<Private> d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.83.0/tests/projecttest/CMakeLists.txt new/attica-5.84.0/tests/projecttest/CMakeLists.txt --- old/attica-5.83.0/tests/projecttest/CMakeLists.txt 2021-06-05 10:49:06.000000000 +0200 +++ new/attica-5.84.0/tests/projecttest/CMakeLists.txt 2021-06-19 17:51:36.000000000 +0200 @@ -3,15 +3,16 @@ find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED) set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Required for tests") -set(editproject_UI editproject.ui) -qt_wrap_ui(editproject_UI_H ${editproject_UI}) +add_executable(projecttest) +ecm_mark_as_test(projecttest) + +set(editproject_UI_H) +qt_wrap_ui(editproject_UI_H editproject.ui) -set(projecttest_SRCS +target_sources(projecttest PRIVATE projecttest.cpp main.cpp + ${editproject_UI_H} ) -add_executable(projecttest ${projecttest_SRCS} ${editproject_UI_H}) -ecm_mark_as_test(projecttest) - target_link_libraries(projecttest Qt5::Widgets KF5::Attica)
