Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-kquickcharts for openSUSE:Leap:16.0 checked in at 2025-04-23 10:08:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:16.0/kf6-kquickcharts (Old) and /work/SRC/openSUSE:Leap:16.0/.kf6-kquickcharts.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kquickcharts" Wed Apr 23 10:08:48 2025 rev:3 rq:1271476 version:6.13.0 Changes: -------- --- /work/SRC/openSUSE:Leap:16.0/kf6-kquickcharts/kf6-kquickcharts.changes 2025-03-19 11:47:54.964745492 +0100 +++ /work/SRC/openSUSE:Leap:16.0/.kf6-kquickcharts.new.30101/kf6-kquickcharts.changes 2025-04-23 10:11:52.792322858 +0200 @@ -1,0 +2,74 @@ +Sat Apr 5 12:33:39 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.13.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.13.0 +- Changes since 6.12.0: + * It compiles fine without qt6.9 deprecated methods + * controls: Use implicit size for layout calculations in AxisLabels + * controls: Use polish in AxisLabels instead of custom relayout queueing + * Update dependency version to 6.13.0 + +------------------------------------------------------------------- +Tue Mar 11 09:29:23 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.12.0 +- Changes since 6.11.0: + * Update dependency version to 6.12.0 + * Update version to 6.12.0 + +------------------------------------------------------------------- +Sat Feb 8 12:16:54 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.11.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.11.0 +- Changes since 6.10.0: + * Update dependency version to 6.11.0 + * Add xml/yaml linting + * CI: Add linux-qt6-next build + * Update version to 6.11.0 + +------------------------------------------------------------------- +Thu Jan 9 17:12:37 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.10.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.10.0 +- Changes since 6.9.0: + * Update dependency version to 6.10.0 + * Remove unimplemented methods + * Update version to 6.10.0 + +------------------------------------------------------------------- +Sun Dec 8 10:09:25 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.9.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.9.0 +- Changes since 6.8.0: + * Update dependency version to 6.9.0 + * Bump KF and QT versions in ecm_set_disabled_deprecation_versions + * Update version to 6.9.0 + +------------------------------------------------------------------- +Mon Nov 4 11:18:16 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.8.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.8.0 +- Changes since 6.7.0: + * Update dependency version to 6.8.0 + * Update version to 6.8.0 + * Add CI for static builds on Linux + * Correctly install static QML modules + +------------------------------------------------------------------- Old: ---- kquickcharts-6.7.0.tar.xz kquickcharts-6.7.0.tar.xz.sig New: ---- kquickcharts-6.13.0.tar.xz kquickcharts-6.13.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.CerQhv/_old 2025-04-23 10:11:53.064334232 +0200 +++ /var/tmp/diff_new_pack.CerQhv/_new 2025-04-23 10:11:53.064334232 +0200 @@ -1,7 +1,7 @@ # # spec file for package kf6-kquickcharts # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ %define qt6_version 6.7.0 %define rname kquickcharts -# Full KF6 version (e.g. 6.7.0) +# Full KF6 version (e.g. 6.13.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-kquickcharts -Version: 6.7.0 +Version: 6.13.0 Release: 0 Summary: Set of charts for QtQuick applications License: LGPL-2.1-or-later ++++++ kquickcharts-6.7.0.tar.xz -> kquickcharts-6.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/.gitlab-ci.yml new/kquickcharts-6.13.0/.gitlab-ci.yml --- old/kquickcharts-6.7.0/.gitlab-ci.yml 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/.gitlab-ci.yml 2025-04-04 16:02:49.000000000 +0200 @@ -5,7 +5,11 @@ - project: sysadmin/ci-utilities file: - /gitlab-templates/linux-qt6.yml + - /gitlab-templates/linux-qt6-next.yml + - /gitlab-templates/linux-qt6-static.yml - /gitlab-templates/android-qt6.yml - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/windows-qt6.yml - /gitlab-templates/alpine-qt6.yml + - /gitlab-templates/xml-lint.yml + - /gitlab-templates/yaml-lint.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/.kde-ci.yml new/kquickcharts-6.13.0/.kde-ci.yml --- old/kquickcharts-6.7.0/.kde-ci.yml 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/.kde-ci.yml 2025-04-04 16:02:49.000000000 +0200 @@ -1,8 +1,8 @@ Dependencies: -- 'on': ['@all'] - 'require': + - 'on': ['@all'] + 'require': 'frameworks/extra-cmake-modules': '@same' Options: - test-before-installing: True - require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] + test-before-installing: True + require-passing-tests-on: ['Linux', 'FreeBSD', 'Windows'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/CMakeLists.txt new/kquickcharts-6.13.0/CMakeLists.txt --- old/kquickcharts-6.7.0/CMakeLists.txt 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/CMakeLists.txt 2025-04-04 16:02:49.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.7.0") # handled by release scripts -set(KF_DEP_VERSION "6.7.0") # handled by release scripts +set(KF_VERSION "6.13.0") # handled by release scripts +set(KF_DEP_VERSION "6.13.0") # handled by release scripts project(KQuickCharts VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 6.7.0 NO_MODULE) +find_package(ECM 6.13.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) @@ -27,13 +27,13 @@ option(BUILD_EXAMPLES "Build example applications" OFF) -set(REQUIRED_QT_VERSION 6.5.0) +set(REQUIRED_QT_VERSION 6.6.0) find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Qml Quick QuickControls2 ShaderTools) set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") ecm_set_disabled_deprecation_versions( - QT 6.2.0 + QT 6.9.0 ) ecm_setup_version( @@ -68,6 +68,9 @@ COMPONENT Devel ) +install(EXPORT KF6QuickChartsTargets DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6QuickCharts" + FILE KF6QuickChartsTargets.cmake NAMESPACE KF6:: COMPONENT Devel) + include(ECMFeatureSummary) ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/KF6QuickChartsConfig.cmake.in new/kquickcharts-6.13.0/KF6QuickChartsConfig.cmake.in --- old/kquickcharts-6.7.0/KF6QuickChartsConfig.cmake.in 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/KF6QuickChartsConfig.cmake.in 2025-04-04 16:02:49.000000000 +0200 @@ -8,4 +8,5 @@ ecm_find_qmlmodule(org.kde.quickcharts 1.0) +include("${CMAKE_CURRENT_LIST_DIR}/KF6QuickChartsTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/autotests/CMakeLists.txt new/kquickcharts-6.13.0/autotests/CMakeLists.txt --- old/kquickcharts-6.7.0/autotests/CMakeLists.txt 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/autotests/CMakeLists.txt 2025-04-04 16:02:49.000000000 +0200 @@ -12,11 +12,20 @@ MapProxySourceTest.cpp HistoryProxySourceTest.cpp ItemBuilderTest.cpp - LINK_LIBRARIES Qt6::Test QuickCharts + LINK_LIBRARIES PRIVATE Qt6::Test QuickCharts ) +if (NOT BUILD_SHARED_LIBS) + target_link_libraries(ItemBuilderTest PRIVATE QuickChartsplugin) + qt6_import_qml_plugins(ItemBuilderTest) +endif() add_executable(qmltest qmltest.cpp) -target_link_libraries(qmltest Qt6::QuickTest QuickCharts) + +target_link_libraries(qmltest PRIVATE Qt6::QuickTest QuickCharts) +if (NOT BUILD_SHARED_LIBS) + target_link_libraries(qmltest PRIVATE QuickChartsplugin) + qt6_import_qml_plugins(qmltest) +endif() macro(add_qml_tests) if (WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/autotests/qmltest.cpp new/kquickcharts-6.13.0/autotests/qmltest.cpp --- old/kquickcharts-6.7.0/autotests/qmltest.cpp 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/autotests/qmltest.cpp 2025-04-04 16:02:49.000000000 +0200 @@ -8,9 +8,4 @@ #include <QtQuickTest> -#ifdef IMPORT_KQUICKCHARTS_QML_PLUGIN -#include <QPluginLoader> -Q_IMPORT_PLUGIN(QuickChartsPlugin) -#endif - QUICK_TEST_MAIN(Charts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/controls/AxisLabels.cpp new/kquickcharts-6.13.0/controls/AxisLabels.cpp --- old/kquickcharts-6.7.0/controls/AxisLabels.cpp 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/controls/AxisLabels.cpp 2025-04-04 16:02:49.000000000 +0200 @@ -52,7 +52,7 @@ : QQuickItem(parent) { m_itemBuilder = std::make_unique<ItemBuilder>(); - connect(m_itemBuilder.get(), &ItemBuilder::finished, this, &AxisLabels::scheduleLayout); + connect(m_itemBuilder.get(), &ItemBuilder::finished, this, &AxisLabels::polish); connect(m_itemBuilder.get(), &ItemBuilder::beginCreate, this, &AxisLabels::onBeginCreate); } @@ -70,7 +70,7 @@ } m_direction = newDirection; - scheduleLayout(); + polish(); Q_EMIT directionChanged(); } @@ -129,7 +129,7 @@ } m_alignment = newAlignment; - scheduleLayout(); + polish(); Q_EMIT alignmentChanged(); } @@ -145,51 +145,13 @@ } m_constrainToBounds = newConstrainToBounds; - scheduleLayout(); + polish(); Q_EMIT constrainToBoundsChanged(); } -void AxisLabels::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) -{ - QQuickItem::geometryChange(newGeometry, oldGeometry); - - if (newGeometry != oldGeometry) { - scheduleLayout(); - } -} - -void AxisLabels::scheduleLayout() -{ - if (!m_layoutScheduled) { - auto scheduleLayoutLambda = [this]() { - layout(); - m_layoutScheduled = false; - }; - QMetaObject::invokeMethod(this, scheduleLayoutLambda, Qt::QueuedConnection); - m_layoutScheduled = true; - } -} - -bool AxisLabels::isHorizontal() -{ - return m_direction == Direction::HorizontalLeftRight || m_direction == Direction::HorizontalRightLeft; -} - -void AxisLabels::updateLabels() -{ - m_itemBuilder->clear(); - - if (!m_itemBuilder->component() || !m_source) { - return; - } - - m_itemBuilder->setCount(m_source->itemCount()); - m_itemBuilder->build(this); -} -void AxisLabels::layout() +void AxisLabels::updatePolish() { if (!m_itemBuilder->isFinished()) { - scheduleLayout(); return; } @@ -200,10 +162,10 @@ auto labels = m_itemBuilder->items(); for (auto label : labels) { - maxWidth = std::max(maxWidth, label->width()); - maxHeight = std::max(maxHeight, label->height()); - totalWidth += label->width(); - totalHeight += label->height(); + maxWidth = std::max(maxWidth, label->implicitWidth()); + maxHeight = std::max(maxHeight, label->implicitHeight()); + totalWidth += label->implicitWidth(); + totalHeight += label->implicitHeight(); } auto impWidth = isHorizontal() ? totalWidth : maxWidth; @@ -213,8 +175,7 @@ return; } - setImplicitWidth(impWidth); - setImplicitHeight(impHeight); + setImplicitSize(impWidth, impHeight); auto spacing = (isHorizontal() ? width() : height()) / (labels.size() - 1); auto i = 0; @@ -241,44 +202,61 @@ } if (m_alignment & Qt::AlignHCenter) { - x += (layoutWidth - label->width()) / 2; + x += (layoutWidth - label->implicitWidth()) / 2; } else if (m_alignment & Qt::AlignRight) { - x += layoutWidth - label->width(); + x += layoutWidth - label->implicitWidth(); } if (m_alignment & Qt::AlignVCenter) { - y += (layoutHeight - label->height()) / 2; + y += (layoutHeight - label->implicitHeight()) / 2; } else if (m_alignment & Qt::AlignBottom) { - y += layoutHeight - label->height(); + y += layoutHeight - label->implicitHeight(); } if (m_constrainToBounds) { x = std::max(x, 0.0); - x = x + label->width() > width() ? width() - label->width() : x; + x = x + label->implicitWidth() > width() ? width() - label->implicitWidth() : x; y = std::max(y, 0.0); - y = y + label->height() > height() ? height() - label->height() : y; + y = y + label->implicitHeight() > height() ? height() - label->implicitHeight() : y; } label->setX(x); label->setY(y); + i++; } } +void AxisLabels::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) +{ + QQuickItem::geometryChange(newGeometry, oldGeometry); + + if (newGeometry != oldGeometry) { + polish(); + } +} + +bool AxisLabels::isHorizontal() +{ + return m_direction == Direction::HorizontalLeftRight || m_direction == Direction::HorizontalRightLeft; +} + +void AxisLabels::updateLabels() +{ + m_itemBuilder->clear(); + + if (!m_itemBuilder->component() || !m_source) { + return; + } + + m_itemBuilder->setCount(m_source->itemCount()); + m_itemBuilder->build(this); +} + void AxisLabels::onBeginCreate(int index, QQuickItem *item) { - QObject::connect(item, &QQuickItem::xChanged, this, [this]() { - scheduleLayout(); - }); - QObject::connect(item, &QQuickItem::yChanged, this, [this]() { - scheduleLayout(); - }); - QObject::connect(item, &QQuickItem::widthChanged, this, [this]() { - scheduleLayout(); - }); - QObject::connect(item, &QQuickItem::heightChanged, this, [this]() { - scheduleLayout(); - }); + QObject::connect(item, &QQuickItem::implicitWidthChanged, this, &AxisLabels::polish); + QObject::connect(item, &QQuickItem::implicitHeightChanged, this, &AxisLabels::polish); auto attached = static_cast<AxisLabelsAttached *>(qmlAttachedPropertiesObject<AxisLabels>(item, true)); attached->setIndex(index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/controls/AxisLabels.h new/kquickcharts-6.13.0/controls/AxisLabels.h --- old/kquickcharts-6.7.0/controls/AxisLabels.h 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/controls/AxisLabels.h 2025-04-04 16:02:49.000000000 +0200 @@ -89,13 +89,12 @@ } protected: + void updatePolish() override; void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; private: - void scheduleLayout(); bool isHorizontal(); void updateLabels(); - void layout(); void onBeginCreate(int index, QQuickItem *item); Direction m_direction = Direction::HorizontalLeftRight; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/controls/LegendLayout.h new/kquickcharts-6.13.0/controls/LegendLayout.h --- old/kquickcharts-6.7.0/controls/LegendLayout.h 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/controls/LegendLayout.h 2025-04-04 16:02:49.000000000 +0200 @@ -77,7 +77,6 @@ void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override; private: - void updateItem(int index, QQuickItem *item); std::tuple<int, int, qreal, qreal> determineColumns(); qreal m_horizontalSpacing = 0.0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/metainfo.yaml new/kquickcharts-6.13.0/metainfo.yaml --- old/kquickcharts-6.7.0/metainfo.yaml 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/metainfo.yaml 2025-04-04 16:02:49.000000000 +0200 @@ -5,16 +5,16 @@ release: true type: functional platforms: -- name: Linux -- name: FreeBSD -- name: Android -- name: Windows -- name: macOS + - name: Linux + - name: FreeBSD + - name: Android + - name: Windows + - name: macOS public_lib: true public_source_dirs: -- controls -- src + - controls + - src libraries: - - cmake: KF6::QuickCharts + - cmake: KF6::QuickCharts cmakename: KF6QuickCharts irc: kde-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-6.7.0/src/CMakeLists.txt new/kquickcharts-6.13.0/src/CMakeLists.txt --- old/kquickcharts-6.7.0/src/CMakeLists.txt 2024-10-04 17:09:24.000000000 +0200 +++ new/kquickcharts-6.13.0/src/CMakeLists.txt 2025-04-04 16:02:49.000000000 +0200 @@ -5,7 +5,13 @@ VERSION ${KF6QuickCharts_VERSION} ) -ecm_add_qml_module(QuickCharts URI "org.kde.quickcharts" VERSION 1.0 DEPENDENCIES QtQuick GENERATE_PLUGIN_SOURCE) +ecm_add_qml_module(QuickCharts + URI "org.kde.quickcharts" + VERSION 1.0 + DEPENDENCIES QtQuick + GENERATE_PLUGIN_SOURCE + INSTALLED_PLUGIN_TARGET KF6::QuickChartsplugin +) target_sources(QuickCharts PRIVATE BarChart.cpp @@ -119,6 +125,7 @@ piechart.vert.qsb piechart.frag.qsb ${_extra_args} + OUTPUT_TARGETS _out_targets ) ecm_generate_export_header(QuickCharts @@ -130,8 +137,8 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -ecm_finalize_qml_module(QuickCharts DESTINATION ${KDE_INSTALL_QMLDIR}) +ecm_finalize_qml_module(QuickCharts DESTINATION ${KDE_INSTALL_QMLDIR} EXPORT KF6QuickChartsTargets) ecm_qt_install_logging_categories(EXPORT KQuickCharts DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -install(TARGETS QuickCharts ${KDE_INSTALL_DEFAULT_ARGUMENTS}) +install(TARGETS QuickCharts ${_out_targets} EXPORT KF6QuickChartsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
