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 2022-01-11 21:15:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Tue Jan 11 21:15:49 2022 rev:99 rq:945023 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2021-12-13 20:42:22.480470219 +0100 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new.1892/attica-qt5.changes 2022-01-11 21:17:11.068870830 +0100 @@ -1,0 +2,11 @@ +Mon Jan 3 12:47:07 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Remove unused and not exported QDebug stream operator for Attica::Category + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- attica-5.89.0.tar.xz attica-5.89.0.tar.xz.sig New: ---- attica-5.90.0.tar.xz attica-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.0VGWF7/_old 2022-01-11 21:17:11.628871224 +0100 +++ /var/tmp/diff_new_pack.0VGWF7/_new 2022-01-11 21:17:11.632871227 +0100 @@ -19,22 +19,22 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.89 +%define _tar_path 5.90 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: attica-qt5 -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{rname}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{rname}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ attica-5.89.0.tar.xz -> attica-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/CMakeLists.txt new/attica-5.90.0/CMakeLists.txt --- old/attica-5.89.0/CMakeLists.txt 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/CMakeLists.txt 2022-01-01 13:10:16.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(Attica VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -38,8 +38,8 @@ # Dependencies set(REQUIRED_QT_VERSION 5.15.2) -# Required Qt5 components to build this framework -find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Network) +# Required Qt components to build this framework +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Network) set(ATTICA_LIB_SONAME KF5Attica) @@ -86,7 +86,7 @@ NAMESPACE KF5::) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/attica_version.h" - DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" + DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF}" COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/KF5AtticaConfig.cmake.in new/attica-5.90.0/KF5AtticaConfig.cmake.in --- old/attica-5.89.0/KF5AtticaConfig.cmake.in 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/KF5AtticaConfig.cmake.in 2022-01-01 13:10:16.000000000 +0100 @@ -2,8 +2,8 @@ # Required components to use this framework include(CMakeFindDependencyMacro) -find_dependency(Qt5Core "@REQUIRED_QT_VERSION@") -find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Network @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5AtticaTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/autotests/CMakeLists.txt new/attica-5.90.0/autotests/CMakeLists.txt --- old/attica-5.89.0/autotests/CMakeLists.txt 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:10:16.000000000 +0100 @@ -1,11 +1,11 @@ include(ECMAddTests) -find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test) -set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for autotests") +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test) +set_package_properties(Qt${QT_MAJOR_VERSION}Test PROPERTIES PURPOSE "Required for autotests") ecm_add_tests( configtest.cpp persontest.cpp providertest.cpp - LINK_LIBRARIES Qt5::Test KF5::Attica + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::Attica ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/CMakeLists.txt new/attica-5.90.0/src/CMakeLists.txt --- old/attica-5.89.0/src/CMakeLists.txt 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/CMakeLists.txt 2022-01-01 13:10:16.000000000 +0100 @@ -114,10 +114,10 @@ target_link_libraries(KF5Attica PUBLIC - Qt5::Core - Qt5::Network + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Network ) -target_include_directories(KF5Attica INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Attica>") +target_include_directories(KF5Attica INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/Attica>") ecm_generate_headers(Attica_CamelCase_HEADERS @@ -174,7 +174,7 @@ platformdependent_v2.h ) -install(FILES ${Attica_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Attica/Attica COMPONENT Devel) +install(FILES ${Attica_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Attica/Attica COMPONENT Devel) install(TARGETS KF5Attica EXPORT KF5AtticaTargets @@ -184,7 +184,7 @@ ${Attica_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/attica_export.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Attica/attica + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Attica/attica COMPONENT Devel ) @@ -221,7 +221,7 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME Attica LIB_NAME KF5Attica DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Attica) +ecm_generate_pri_file(BASE_NAME Attica LIB_NAME KF5Attica DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/Attica) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/category.cpp new/attica-5.90.0/src/category.cpp --- old/attica-5.89.0/src/category.cpp 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/category.cpp 2022-01-01 13:10:16.000000000 +0100 @@ -13,13 +13,6 @@ using namespace Attica; -QDebug operator<<(QDebug s, const Attica::Category &cat) -{ - const QString name = cat.isValid() ? cat.name() : QStringLiteral("Invalid"); - s.nospace() << "Category(" << name << ')'; - return s.space(); -} - class Category::Private : public QSharedData { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/category.h new/attica-5.90.0/src/category.h --- old/attica-5.89.0/src/category.h 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/category.h 2022-01-01 13:10:16.000000000 +0100 @@ -104,6 +104,4 @@ } -QDebug operator<<(QDebug s, const Attica::Category &cat); - #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/cmake/libKF5Attica.pc.cmake new/attica-5.90.0/src/cmake/libKF5Attica.pc.cmake --- old/attica-5.89.0/src/cmake/libKF5Attica.pc.cmake 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/cmake/libKF5Attica.pc.cmake 2022-01-01 13:10:16.000000000 +0100 @@ -6,7 +6,7 @@ Name: lib@ATTICA_LIB_SONAME@ Description: Qt library to access Open Collaboration Services URL: https://www.kde.org -Requires: Qt5Core Qt5Network +Requires: Qt@QT_MAJOR_VERSION@Core Qt@QT_MAJOR_VERSION@Network Version: @ATTICA_VERSION@ Libs: -L@KDE_INSTALL_FULL_LIBDIR@ -l@ATTICA_LIB_SONAME@ -Cflags: -I@KDE_INSTALL_FULL_INCLUDEDIR_KF5@/Attica +Cflags: -I@KDE_INSTALL_FULL_INCLUDEDIR_KF@/Attica diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/content.cpp new/attica-5.90.0/src/content.cpp --- old/attica-5.89.0/src/content.cpp 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/content.cpp 2022-01-01 13:10:16.000000000 +0100 @@ -237,7 +237,11 @@ if (key.startsWith(QLatin1String("homepagetype"))) { bool ok; // remove "homepage", get the rest as number - int num = key.rightRef(key.size() - 12).toInt(&ok); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const int num = QStringView(key).right(key.size() - 12).toInt(&ok); +#else + const int num = key.rightRef(key.size() - 12).toInt(&ok); +#endif if (ok) { // check if the homepage actually has a valid type if (!iter.value().isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/provider.cpp new/attica-5.90.0/src/provider.cpp --- old/attica-5.89.0/src/provider.cpp 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/provider.cpp 2022-01-01 13:10:16.000000000 +0100 @@ -69,16 +69,6 @@ using namespace Attica; -QDebug operator<<(QDebug s, const Attica::Provider &prov) -{ - if (prov.isValid()) { - s.nospace() << "Provider(" << prov.name() << ':' << prov.baseUrl() << ')'; - } else { - s.nospace() << "Provider(Invalid)"; - } - return s.space(); -} - class Provider::Private : public QSharedData { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/src/provider.h new/attica-5.90.0/src/provider.h --- old/attica-5.89.0/src/provider.h 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/src/provider.h 2022-01-01 13:10:16.000000000 +0100 @@ -787,6 +787,4 @@ }; } -QDebug operator<<(QDebug s, const Attica::Provider &prov); - #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.89.0/tests/projecttest/CMakeLists.txt new/attica-5.90.0/tests/projecttest/CMakeLists.txt --- old/attica-5.89.0/tests/projecttest/CMakeLists.txt 2021-12-04 17:54:53.000000000 +0100 +++ new/attica-5.90.0/tests/projecttest/CMakeLists.txt 2022-01-01 13:10:16.000000000 +0100 @@ -1,7 +1,7 @@ include(ECMMarkAsTest) -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED) -set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Required for tests") +find_package(Qt${QT_MAJOR_VERSION}Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED) +set_package_properties(Qt${QT_MAJOR_VERSION}Widgets PROPERTIES PURPOSE "Required for tests") add_executable(projecttest) ecm_mark_as_test(projecttest) @@ -15,4 +15,4 @@ ${editproject_UI_H} ) -target_link_libraries(projecttest Qt5::Widgets KF5::Attica) +target_link_libraries(projecttest Qt${QT_MAJOR_VERSION}::Widgets KF5::Attica)
