Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2019-11-12 11:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Tue Nov 12 11:48:12 2019 rev:72 rq:747121 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2019-10-14 13:37:04.610089466 +0200 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.2990/kitemmodels.changes 2019-11-12 11:48:13.710899147 +0100 @@ -1,0 +2,11 @@ +Sun Nov 3 15:47:06 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- 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: + * autotests: check that mapFromSource returns invalid for unmapped columns. + * Use ECMGenerateExportHeader to manage deprecated API better + +------------------------------------------------------------------- Old: ---- kitemmodels-5.63.0.tar.xz kitemmodels-5.63.0.tar.xz.sig New: ---- kitemmodels-5.64.0.tar.xz kitemmodels-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.Q5fJCC/_old 2019-11-12 11:48:14.266899715 +0100 +++ /var/tmp/diff_new_pack.Q5fJCC/_new 2019-11-12 11:48:14.266899715 +0100 @@ -18,7 +18,7 @@ %define clang_sonum 3.8 %define lname libKF5ItemModels5 -%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: kitemmodels -Version: 5.63.0 +Version: 5.64.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later ++++++ kitemmodels-5.63.0.tar.xz -> kitemmodels-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.63.0/CMakeLists.txt new/kitemmodels-5.64.0/CMakeLists.txt --- old/kitemmodels-5.63.0/CMakeLists.txt 2019-10-06 11:36:11.000000000 +0200 +++ new/kitemmodels-5.64.0/CMakeLists.txt 2019-11-02 12:44:57.000000000 +0100 @@ -1,10 +1,10 @@ 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(KItemModels VERSION ${KF5_VERSION}) 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) @@ -19,13 +19,13 @@ set(REQUIRED_QT_VERSION 5.11.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - -include(GenerateExportHeader) - +include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) +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)") @@ -34,6 +34,8 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemModelsConfigVersion.cmake" SOVERSION 5) add_definitions(-DQT_NO_FOREACH) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.63.0/autotests/krearrangecolumnsproxymodeltest.cpp new/kitemmodels-5.64.0/autotests/krearrangecolumnsproxymodeltest.cpp --- old/kitemmodels-5.63.0/autotests/krearrangecolumnsproxymodeltest.cpp 2019-10-06 11:36:11.000000000 +0200 +++ new/kitemmodels-5.64.0/autotests/krearrangecolumnsproxymodeltest.cpp 2019-11-02 12:44:57.000000000 +0100 @@ -106,6 +106,9 @@ QCOMPARE(pm.sourceColumnForProxyColumn(0), 3); QCOMPARE(pm.sourceColumnForProxyColumn(1), 1); QCOMPARE(pm.sourceColumnForProxyColumn(2), 0); + + // And mapFromSource should return invalid for unmapped cells + QVERIFY(!pm.mapFromSource(sourceModel.index(0, 2)).isValid()); } void shouldShowNothingIfNoRows() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.63.0/docs/Doxyfile.local new/kitemmodels-5.64.0/docs/Doxyfile.local --- old/kitemmodels-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/kitemmodels-5.64.0/docs/Doxyfile.local 2019-11-02 12:44:57.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "KITEMMODELS_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "KITEMMODELS_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "KITEMMODELS_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.63.0/src/CMakeLists.txt new/kitemmodels-5.64.0/src/CMakeLists.txt --- old/kitemmodels-5.63.0/src/CMakeLists.txt 2019-10-06 11:36:11.000000000 +0200 +++ new/kitemmodels-5.64.0/src/CMakeLists.txt 2019-11-02 12:44:57.000000000 +0100 @@ -15,8 +15,20 @@ ecm_qt_declare_logging_category(kitemmodels_SRCS HEADER kitemmodels_debug.h IDENTIFIER KITEMMODELS_LOG CATEGORY_NAME kf5.kitemmodels) add_library(KF5ItemModels ${kitemmodels_SRCS}) -generate_export_header(KF5ItemModels BASE_NAME KItemModels) add_library(KF5::ItemModels ALIAS KF5ItemModels) +ecm_generate_export_header(KF5ItemModels + BASE_NAME KItemModels + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 4.8 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) +# reminder trigger to apply KITEMMODELS_ENABLE_DEPRECATED_SINCE & friends to KConcatenateRowsProxyModel when the time is there +if (REQUIRED_QT_VERSION VERSION_GREATER 5.12.0) + message(WARNING "With Qt 5.13 as min dep, mark KConcatenateRowsProxyModel as deprecated to the compiler & remove this warning") +endif() + target_include_directories(KF5ItemModels INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KItemModels>") @@ -91,6 +103,7 @@ ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS KITEMMODELS_EXPORT + "KITEMMODELS_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/kitemmodels-5.63.0/src/kdescendantsproxymodel.cpp new/kitemmodels-5.64.0/src/kdescendantsproxymodel.cpp --- old/kitemmodels-5.63.0/src/kdescendantsproxymodel.cpp 2019-10-06 11:36:11.000000000 +0200 +++ new/kitemmodels-5.64.0/src/kdescendantsproxymodel.cpp 2019-11-02 12:44:57.000000000 +0100 @@ -208,10 +208,12 @@ delete d_ptr; } +#if KITEMMODELS_BUILD_DEPRECATED_SINCE(4, 8) void KDescendantsProxyModel::setRootIndex(const QModelIndex &index) { Q_UNUSED(index) } +#endif QModelIndexList KDescendantsProxyModel::match(const QModelIndex &start, int role, const QVariant &value, int hits, Qt::MatchFlags flags) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.63.0/src/kdescendantsproxymodel.h new/kitemmodels-5.64.0/src/kdescendantsproxymodel.h --- old/kitemmodels-5.63.0/src/kdescendantsproxymodel.h 2019-10-06 11:36:11.000000000 +0200 +++ new/kitemmodels-5.64.0/src/kdescendantsproxymodel.h 2019-11-02 12:44:57.000000000 +0100 @@ -104,12 +104,15 @@ */ void setSourceModel(QAbstractItemModel *model) override; +#if KITEMMODELS_ENABLE_DEPRECATED_SINCE(4, 8) /** - * @deprecated + * @deprecated Since 4.8 * * This method does nothing. */ + KITEMMODELS_DEPRECATED_VERSION(4, 8, "Method is a no-op.") void setRootIndex(const QModelIndex &index); +#endif /** * Set whether to show ancestor data in the model. If @p display is true, then
