Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kquickcharts for openSUSE:Factory checked in at 2022-04-11 23:47:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kquickcharts (Old) and /work/SRC/openSUSE:Factory/.kquickcharts.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kquickcharts" Mon Apr 11 23:47:29 2022 rev:29 rq:968188 version:5.93.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kquickcharts/kquickcharts.changes 2022-03-14 19:36:13.978066428 +0100 +++ /work/SRC/openSUSE:Factory/.kquickcharts.new.1900/kquickcharts.changes 2022-04-11 23:48:54.711297805 +0200 @@ -1,0 +2,19 @@ +Sun Apr 3 10:47:24 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.93.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.93.0 +- Changes since 5.92.0: + * Add Android, Windows and MacOS to supported platforms + * Correct install location for ecm_finalize_qml_module() + * cmake: Use the right path to find ECMFindQmlModule.cmake + * Don't crash if we have no qmlContext for a deprecated object + * Use the right path when including ECMFindQmlModule in CMake package config + * Fix punctuation/whitespace of runtime rate-limited deprecation warnings + * Don't add module-uri based path to finalize_qml_module + * Don't use CMake exports for things that aren't really exported + * Port controls module to use ECMQmlModule + * Port main module to use ECMQmlModule + +------------------------------------------------------------------- Old: ---- kquickcharts-5.92.0.tar.xz kquickcharts-5.92.0.tar.xz.sig New: ---- kquickcharts-5.93.0.tar.xz kquickcharts-5.93.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.PPjClR/_old 2022-04-11 23:48:55.175292501 +0200 +++ /var/tmp/diff_new_pack.PPjClR/_new 2022-04-11 23:48:55.183292410 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.92 +%define _tar_path 5.93 # 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 released Name: kquickcharts -Version: 5.92.0 +Version: 5.93.0 Release: 0 Summary: Set of charts for QtQuick applications License: LGPL-2.1-or-later ++++++ kquickcharts-5.92.0.tar.xz -> kquickcharts-5.93.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/CMakeLists.txt new/kquickcharts-5.93.0/CMakeLists.txt --- old/kquickcharts-5.92.0/CMakeLists.txt 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/CMakeLists.txt 2022-04-02 12:02:59.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.92.0") # handled by release scripts -set(KF_DEP_VERSION "5.92.0") # handled by release scripts +set(KF_VERSION "5.93.0") # handled by release scripts +set(KF_DEP_VERSION "5.93.0") # handled by release scripts project(KQuickCharts VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.92.0 NO_MODULE) +find_package(ECM 5.93.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) @@ -22,6 +22,7 @@ include(ECMAddTests) include(ECMSetupVersion) include(ECMQtDeclareLoggingCategory) +include(ECMQmlModule) option(BUILD_EXAMPLES "Build example applications" OFF) @@ -62,12 +63,6 @@ COMPONENT Devel ) -install(EXPORT KF5QuickChartsTargets - DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5QuickCharts - FILE KF5QuickChartsTargets.cmake - NAMESPACE KF5:: -) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/KF5QuickChartsConfig.cmake.in new/kquickcharts-5.93.0/KF5QuickChartsConfig.cmake.in --- old/kquickcharts-5.92.0/KF5QuickChartsConfig.cmake.in 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/KF5QuickChartsConfig.cmake.in 2022-04-02 12:02:59.000000000 +0200 @@ -3,5 +3,9 @@ include(CMakeFindDependencyMacro) find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) -include("${CMAKE_CURRENT_LIST_DIR}/KF5QuickChartsTargets.cmake") +find_dependency(ECM @KF_DEP_VERSION@) +include(${ECM_DIR}/../modules/ECMFindQmlModule.cmake) + +ecm_find_qmlmodule(org.kde.quickcharts 1.0) + @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/controls/CMakeLists.txt new/kquickcharts-5.93.0/controls/CMakeLists.txt --- old/kquickcharts-5.92.0/controls/CMakeLists.txt 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/controls/CMakeLists.txt 2022-04-02 12:02:59.000000000 +0200 @@ -1,24 +1,27 @@ +ecm_add_qml_module(QuickChartsControls URI "org.kde.quickcharts.controls") -add_library(chartscontrolsplugin SHARED ChartsControlsPlugin.cpp) -target_link_libraries(chartscontrolsplugin - Qt${QT_MAJOR_VERSION}::Core - Qt${QT_MAJOR_VERSION}::Quick - Qt${QT_MAJOR_VERSION}::Qml - Qt${QT_MAJOR_VERSION}::Gui - Qt${QT_MAJOR_VERSION}::QuickControls2 -) +target_sources(QuickChartsControls PRIVATE ChartsControlsPlugin.cpp) -install(TARGETS chartscontrolsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/quickcharts/controls) -install(FILES - qmldir +ecm_target_qml_sources(QuickChartsControls SOURCES Legend.qml LegendDelegate.qml LineChartControl.qml PieChartControl.qml Theme.qml Logging.qml - DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/quickcharts/controls ) -install(DIRECTORY styles DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/quickcharts/controls) +ecm_target_qml_sources(QuickChartsControls PRIVATE PATH styles/org.kde.desktop SOURCES + styles/org.kde.desktop/Theme.qml +) + +target_link_libraries(QuickChartsControls + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Quick + Qt${QT_MAJOR_VERSION}::Qml + Qt${QT_MAJOR_VERSION}::Gui + Qt${QT_MAJOR_VERSION}::QuickControls2 +) + +ecm_finalize_qml_module(QuickChartsControls DESTINATION ${KDE_INSTALL_QMLDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/controls/qmldir new/kquickcharts-5.93.0/controls/qmldir --- old/kquickcharts-5.92.0/controls/qmldir 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/controls/qmldir 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -module org.kde.quickcharts.controls -plugin chartscontrolsplugin - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/metainfo.yaml new/kquickcharts-5.93.0/metainfo.yaml --- old/kquickcharts-5.92.0/metainfo.yaml 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/metainfo.yaml 2022-04-02 12:02:59.000000000 +0200 @@ -8,6 +8,9 @@ platforms: - name: Linux - name: FreeBSD +- name: Android +- name: Windows +- name: macOS public_lib: true public_source_dirs: - controls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/src/CMakeLists.txt new/kquickcharts-5.93.0/src/CMakeLists.txt --- old/kquickcharts-5.92.0/src/CMakeLists.txt 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/src/CMakeLists.txt 2022-04-02 12:02:59.000000000 +0200 @@ -1,5 +1,7 @@ -set(quickcharts_SRCS +add_library(QuickChartsStatic STATIC) + +target_sources(QuickChartsStatic PRIVATE BarChart.cpp BarChart.h Chart.cpp @@ -61,11 +63,11 @@ scenegraph/SDFShader.h XYChart.cpp XYChart.h -) -qt_add_resources(quickcharts_QRC shaders/shaders.qrc) + shaders/shaders.qrc +) -ecm_qt_declare_logging_category(quickcharts_SRCS +ecm_qt_declare_logging_category(QuickChartsStatic HEADER charts_general_logging.h IDENTIFIER GENERAL CATEGORY_NAME kf.quickcharts.general @@ -74,7 +76,7 @@ EXPORT KQuickCharts ) -ecm_qt_declare_logging_category(quickcharts_SRCS +ecm_qt_declare_logging_category(QuickChartsStatic HEADER charts_datasource_logging.h IDENTIFIER DATASOURCE CATEGORY_NAME kf.quickcharts.datasource @@ -83,7 +85,7 @@ EXPORT KQuickCharts ) -ecm_qt_declare_logging_category(quickcharts_SRCS +ecm_qt_declare_logging_category(QuickChartsStatic HEADER charts_deprecated_logging.h IDENTIFIER DEPRECATED CATEGORY_NAME kf.quickcharts.deprecated @@ -92,10 +94,16 @@ EXPORT KQuickCharts ) -add_library(QuickChartsStatic STATIC ${quickcharts_SRCS} ${quickcharts_QRC}) -target_link_libraries(QuickChartsStatic PUBLIC Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Quick Qt${QT_MAJOR_VERSION}::Qml Qt${QT_MAJOR_VERSION}::Quick) +target_link_libraries(QuickChartsStatic PUBLIC + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Quick + Qt${QT_MAJOR_VERSION}::Qml + Qt${QT_MAJOR_VERSION}::Quick +) + +ecm_add_qml_module(QuickCharts URI "org.kde.quickcharts") -add_library(QuickCharts SHARED ChartsPlugin.cpp ChartsPlugin.h) +target_sources(QuickCharts PRIVATE ChartsPlugin.cpp ChartsPlugin.h) target_link_libraries(QuickCharts PRIVATE QuickChartsStatic) ecm_generate_export_header(QuickCharts @@ -107,19 +115,6 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -install(TARGETS QuickCharts EXPORT KF5QuickChartsTargets DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/quickcharts) -install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/quickcharts) +ecm_finalize_qml_module(QuickCharts DESTINATION ${KDE_INSTALL_QMLDIR}) ecm_qt_install_logging_categories(EXPORT KQuickCharts DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - -if (BUILD_TESTING) - add_custom_command(TARGET QuickCharts POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin/org/kde/quickcharts - ) - add_custom_command(TARGET QuickCharts POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/src/qmldir ${CMAKE_BINARY_DIR}/bin/org/kde/quickcharts - ) - add_custom_command(TARGET QuickCharts POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:QuickCharts> ${CMAKE_BINARY_DIR}/bin/org/kde/quickcharts - ) -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.92.0/src/QmlDeprecated.h new/kquickcharts-5.93.0/src/QmlDeprecated.h --- old/kquickcharts-5.92.0/src/QmlDeprecated.h 2022-03-05 12:17:52.000000000 +0100 +++ new/kquickcharts-5.93.0/src/QmlDeprecated.h 2022-04-02 12:02:59.000000000 +0200 @@ -27,8 +27,9 @@ // clang-format off #define QML_DEPRECATED(item, since, message) \ QMetaObject::invokeMethod(this, [this]() {\ - qCWarning(DEPRECATED) << item << "is deprecated (since" << since << "):" << message;\ - QString elidedName = QStringLiteral("...") % qmlContext(this)->baseUrl().toString().right(80);\ + qCWarning(DEPRECATED).nospace() << item << " is deprecated (since " << since << "): " << message;\ + if (!qmlContext(this)) return;\ + QString elidedName = QStringLiteral("...") + qmlContext(this)->baseUrl().toString().right(80);\ qCWarning(DEPRECATED) << "Note: Instantiated from" << elidedName;\ }, Qt::QueuedConnection); // clang-format on
