Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitemviews for openSUSE:Factory checked in at 2022-01-11 21:16:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemviews (Old) and /work/SRC/openSUSE:Factory/.kitemviews.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemviews" Tue Jan 11 21:16:30 2022 rev:98 rq:945067 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemviews/kitemviews.changes 2021-12-13 20:44:24.688485189 +0100 +++ /work/SRC/openSUSE:Factory/.kitemviews.new.1892/kitemviews.changes 2022-01-11 21:19:11.976955873 +0100 @@ -1,0 +2,10 @@ +Mon Jan 3 12:47:42 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: + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- kitemviews-5.89.0.tar.xz kitemviews-5.89.0.tar.xz.sig New: ---- kitemviews-5.90.0.tar.xz kitemviews-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemviews.spec ++++++ --- /var/tmp/diff_new_pack.6X40dX/_old 2022-01-11 21:19:12.532956264 +0100 +++ /var/tmp/diff_new_pack.6X40dX/_new 2022-01-11 21:19:12.536956267 +0100 @@ -17,21 +17,21 @@ %define lname libKF5ItemViews5 -%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}')} -%bcond_without lang +%bcond_without released Name: kitemviews -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Set of item views extending the Qt model-view framework License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -41,7 +41,7 @@ BuildRequires: cmake(Qt5Test) >= 5.15.0 BuildRequires: cmake(Qt5UiPlugin) >= 5.15.0 BuildRequires: cmake(Qt5Widgets) >= 5.15.0 -%if %{with lang} +%if %{with released} BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif @@ -54,9 +54,6 @@ Summary: Set of item views extending the Qt model-view framework Group: System/GUI/KDE %requires_ge libQt5Widgets5 -%if %{with lang} -Recommends: %{lname}-lang = %{version} -%endif %description -n %{lname} KItemViews includes a set of views, which can be used with item models. It @@ -88,14 +85,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 --with-qt --without-mo %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ kitemviews-5.89.0.tar.xz -> kitemviews-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/CMakeLists.txt new/kitemviews-5.90.0/CMakeLists.txt --- old/kitemviews-5.89.0/CMakeLists.txt 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/CMakeLists.txt 2022-01-01 13:32:58.000000000 +0100 @@ -1,22 +1,23 @@ 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(KItemViews VERSION ${KF_VERSION}) 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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(KDEGitCommitHooks) +set(REQUIRED_QT_VERSION 5.15.2) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) + include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) @@ -78,7 +79,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kitemviews_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + 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/kitemviews-5.89.0/KF5ItemViewsConfig.cmake.in new/kitemviews-5.90.0/KF5ItemViewsConfig.cmake.in --- old/kitemviews-5.89.0/KF5ItemViewsConfig.cmake.in 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/KF5ItemViewsConfig.cmake.in 2022-01-01 13:32:58.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Widgets @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5ItemViewsTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/autotests/CMakeLists.txt new/kitemviews-5.90.0/autotests/CMakeLists.txt --- old/kitemviews-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:32:58.000000000 +0100 @@ -1,8 +1,8 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_TO_ASCII) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) include(ECMAddTests) -ecm_add_test(klistwidgetsearchlinetest.cpp TEST_NAME kitemviews-klistwidgetsearchlinetest LINK_LIBRARIES Qt5::Test KF5::ItemViews) +ecm_add_test(klistwidgetsearchlinetest.cpp TEST_NAME kitemviews-klistwidgetsearchlinetest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ItemViews) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/po/ca@valencia/kitemviews5_qt.po new/kitemviews-5.90.0/po/ca@valencia/kitemviews5_qt.po --- old/kitemviews-5.89.0/po/ca@valencia/kitemviews5_qt.po 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/po/ca@valencia/kitemviews5_qt.po 2022-01-01 13:32:58.000000000 +0100 @@ -6,7 +6,7 @@ # Sebasti?? Pla i Sanz <s...@sastia.com>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella P??rez <antonibel...@yahoo.com>, 2003, 2006, 2011, 2012, 2013. # Albert Astals Cid <aa...@kde.org>, 2004, 2005, 2007. -# Josep Ma. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2019, 2020. +# Josep M. Ferrer <txe...@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2019, 2020. # Robert Millan <r...@aybabtu.com>, 2009. # Orestes Mas <ores...@tsc.upc.edu>, 2010. msgid "" @@ -15,7 +15,7 @@ "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2020-05-09 13:52+0100\n" -"Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" +"Last-Translator: Josep M. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/po/zh_CN/kitemviews5_qt.po new/kitemviews-5.90.0/po/zh_CN/kitemviews5_qt.po --- old/kitemviews-5.89.0/po/zh_CN/kitemviews5_qt.po 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/po/zh_CN/kitemviews5_qt.po 2022-01-01 13:32:58.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:06\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/src/CMakeLists.txt new/kitemviews-5.90.0/src/CMakeLists.txt --- old/kitemviews-5.89.0/src/CMakeLists.txt 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/src/CMakeLists.txt 2022-01-01 13:32:58.000000000 +0100 @@ -54,9 +54,9 @@ ) -target_include_directories(KF5ItemViews INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KItemViews>") +target_include_directories(KF5ItemViews INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KItemViews>") -target_link_libraries(KF5ItemViews PUBLIC Qt5::Widgets) +target_link_libraries(KF5ItemViews PUBLIC Qt${QT_MAJOR_VERSION}::Widgets) ecm_generate_headers(KItemViews_HEADERS HEADER_NAMES @@ -100,7 +100,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kitemviews_export.h ${KItemViews_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KItemViews COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KItemViews COMPONENT Devel ) if(BUILD_DESIGNERPLUGIN) @@ -135,7 +135,7 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KItemViews LIB_NAME KF5ItemViews DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KItemViews) +ecm_generate_pri_file(BASE_NAME KItemViews LIB_NAME KF5ItemViews DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KItemViews) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) ecm_qt_install_logging_categories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/src/kcategorizedview.cpp new/kitemviews-5.90.0/src/kcategorizedview.cpp --- old/kitemviews-5.89.0/src/kcategorizedview.cpp 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/src/kcategorizedview.cpp 2022-01-01 13:32:58.000000000 +0100 @@ -101,9 +101,21 @@ return proxyModel && categoryDrawer && proxyModel->isCategorizedModel(); } -QStyleOptionViewItem KCategorizedViewPrivate::blockRect(const QModelIndex &representative) +QStyleOptionViewItem KCategorizedViewPrivate::viewOpts() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QStyleOptionViewItem option; + q->initViewItemOption(&option); +#else QStyleOptionViewItem option(q->viewOptions()); +#endif + return option; +} + +QStyleOptionViewItem KCategorizedViewPrivate::blockRect(const QModelIndex &representative) +{ + QStyleOptionViewItem option = viewOpts(); + const int height = categoryDrawer->categoryHeight(representative, option); const QString categoryDisplay = representative.data(KCategorizedSortFilterProxyModel::CategoryDisplayRole).toString(); QPoint pos = blockPosition(categoryDisplay); @@ -175,7 +187,8 @@ if (index.row() < categoryIndex.row()) { continue; } - res.ry() += categoryDrawer->categoryHeight(categoryIndex, q->viewOptions()) + categorySpacing; + + res.ry() += categoryDrawer->categoryHeight(categoryIndex, viewOpts()) + categorySpacing; if (index.row() == categoryIndex.row()) { continue; } @@ -764,7 +777,8 @@ while (it != d->blocks.constEnd()) { const KCategorizedViewPrivate::Block &block = *it; const QModelIndex categoryIndex = d->proxyModel->index(block.firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - QStyleOptionViewItem option(viewOptions()); + + QStyleOptionViewItem option = d->viewOpts(); option.features |= d->alternatingBlockColors && block.alternate // ? QStyleOptionViewItem::Alternate : QStyleOptionViewItem::None; @@ -814,7 +828,7 @@ const QModelIndex index = d->proxyModel->index(i, modelColumn(), rootIndex()); const Qt::ItemFlags flags = d->proxyModel->flags(index); - QStyleOptionViewItem option(viewOptions()); + QStyleOptionViewItem option(d->viewOpts()); option.rect = visualRect(index); option.widget = this; option.features |= wordWrap() ? QStyleOptionViewItem::WrapText : QStyleOptionViewItem::None; @@ -923,7 +937,7 @@ while (it != d->blocks.constEnd()) { const KCategorizedViewPrivate::Block &block = *it; const QModelIndex categoryIndex = d->proxyModel->index(block.firstIndex.row(), d->proxyModel->sortColumn(), rootIndex()); - QStyleOptionViewItem option(viewOptions()); + QStyleOptionViewItem option(d->viewOpts()); const int height = d->categoryDrawer->categoryHeight(categoryIndex, option); QPoint pos = d->blockPosition(it.key()); pos.ry() -= height; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/src/kcategorizedview_p.h new/kitemviews-5.90.0/src/kcategorizedview_p.h --- old/kitemviews-5.89.0/src/kcategorizedview_p.h 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/src/kcategorizedview_p.h 2022-01-01 13:32:58.000000000 +0100 @@ -33,6 +33,12 @@ bool isCategorized() const; /** + * Wrapper that returns the view's QStyleOptionViewItem, in Qt5 using viewOptions(), and + * in Qt6 using initViewItemOption(). + */ + QStyleOptionViewItem viewOpts(); + + /** * @return the block rect for the representative @p representative. */ QStyleOptionViewItem blockRect(const QModelIndex &representative); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/src/kwidgetitemdelegatepool.cpp new/kitemviews-5.90.0/src/kwidgetitemdelegatepool.cpp --- old/kitemviews-5.89.0/src/kwidgetitemdelegatepool.cpp 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/src/kwidgetitemdelegatepool.cpp 2022-01-01 13:32:58.000000000 +0100 @@ -184,6 +184,21 @@ case QEvent::TabletEnterProximity: case QEvent::TabletLeaveProximity: { QTabletEvent *tabletEvent = static_cast<QTabletEvent *>(event); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QTabletEvent evt(event->type(), + tabletEvent->pointingDevice(), + viewport->mapFromGlobal(tabletEvent->globalPosition()), + tabletEvent->globalPosition(), + tabletEvent->pressure(), + tabletEvent->xTilt(), + tabletEvent->yTilt(), + tabletEvent->tangentialPressure(), + tabletEvent->rotation(), + tabletEvent->z(), + tabletEvent->modifiers(), + tabletEvent->button(), + tabletEvent->buttons()); +#else QTabletEvent evt(event->type(), QPointF(viewport->mapFromGlobal(tabletEvent->globalPos())), tabletEvent->globalPosF(), @@ -199,6 +214,7 @@ tabletEvent->uniqueId(), tabletEvent->button(), tabletEvent->buttons()); +#endif QApplication::sendEvent(viewport, &evt); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.89.0/tests/CMakeLists.txt new/kitemviews-5.90.0/tests/CMakeLists.txt --- old/kitemviews-5.89.0/tests/CMakeLists.txt 2021-12-04 19:39:13.000000000 +0100 +++ new/kitemviews-5.90.0/tests/CMakeLists.txt 2022-01-01 13:32:58.000000000 +0100 @@ -3,12 +3,12 @@ include(ECMMarkAsTest) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) macro(kitemviews_executable_tests) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::Test KF5::ItemViews) + target_link_libraries(${_testname} Qt${QT_MAJOR_VERSION}::Test KF5::ItemViews) ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro()
