Hello community, here is the log from the commit of package kquickcharts for openSUSE:Factory checked in at 2020-02-14 16:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kquickcharts (Old) and /work/SRC/openSUSE:Factory/.kquickcharts.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kquickcharts" Fri Feb 14 16:33:51 2020 rev:3 rq:773284 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kquickcharts/kquickcharts.changes 2020-02-06 13:09:29.976377747 +0100 +++ /work/SRC/openSUSE:Factory/.kquickcharts.new.26092/kquickcharts.changes 2020-02-14 16:34:24.719486679 +0100 @@ -1,0 +2,18 @@ +Sun Feb 2 18:07:09 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:57 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Fix Qt version check + * Expand Pie Chart autotest with multiple value sources and model + * Register QAbstractItemModel as anonymous type for property assignments + * Hide the line of a line chart if its width is set to 0 + +------------------------------------------------------------------- Old: ---- kquickcharts-5.66.0.tar.xz kquickcharts-5.66.0.tar.xz.sig New: ---- kquickcharts-5.67.0.tar.xz kquickcharts-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.4bhurN/_old 2020-02-14 16:34:26.011487399 +0100 +++ /var/tmp/diff_new_pack.4bhurN/_new 2020-02-14 16:34:26.047487419 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.66 +%define _tar_path 5.67 # 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 Name: kquickcharts -Version: 5.66.0 +Version: 5.67.0 Release: 0 Summary: Set of charts for QtQuick applications License: LGPL-2.1-or-later @@ -36,9 +36,9 @@ %endif BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: cmake(Qt5Qml) >= 5.11.0 -BuildRequires: cmake(Qt5Quick) >= 5.11.0 -BuildRequires: cmake(Qt5QuickControls2) >= 5.11.0 +BuildRequires: cmake(Qt5Qml) >= 5.12.0 +BuildRequires: cmake(Qt5Quick) >= 5.12.0 +BuildRequires: cmake(Qt5QuickControls2) >= 5.12.0 Requires: kirigami2 Requires: libqt5-qtquickcontrols2 @@ -64,7 +64,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kquickcharts-5.66.0.tar.xz -> kquickcharts-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.66.0/CMakeLists.txt new/kquickcharts-5.67.0/CMakeLists.txt --- old/kquickcharts-5.66.0/CMakeLists.txt 2020-01-04 00:13:46.000000000 +0100 +++ new/kquickcharts-5.67.0/CMakeLists.txt 2020-02-01 10:06:28.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts -set(KF5_DEP_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts +set(KF5_DEP_VERSION "5.67.0") # handled by release scripts project(KQuickCharts VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.66.0/autotests/tst_PieChart.qml new/kquickcharts-5.67.0/autotests/tst_PieChart.qml --- old/kquickcharts-5.66.0/autotests/tst_PieChart.qml 2020-01-04 00:13:46.000000000 +0100 +++ new/kquickcharts-5.67.0/autotests/tst_PieChart.qml 2020-02-01 10:06:28.000000000 +0100 @@ -44,10 +44,51 @@ } } + Component { + id: multiValue + Charts.PieChart { + width: 200 + height: 200 + nameSource: Charts.ArraySource { array: ["Test 1", "Test 2", "Test 3"] } + colorSource: Charts.ArraySource { array: ["red", "green", "blue"] } + valueSources: [ + Charts.ArraySource { array: [1, 2, 3, 4, 5] }, + Charts.ArraySource { array: [1, 2, 3, 4, 5] }, + Charts.ArraySource { array: [1, 2, 3, 4, 5] } + ] + } + } + + Component { + id: model + Charts.PieChart { + width: 200 + height: 200 + + valueSources: [ + Charts.ModelSource { + model: ListModel { + id: listModel + ListElement { name: "Test 1"; color: "red"; value: 1 } + ListElement { name: "Test 2"; color: "green"; value: 2 } + ListElement { name: "Test 3"; color: "blue"; value: 3 } + ListElement { name: "Test 4"; color: "cyan"; value: 4 } + ListElement { name: "Test 5"; color: "magenta"; value: 5 } + ListElement { name: "Test 6"; color: "yellow"; value: 6 } + } + } + ] + nameSource: Charts.ModelSource { model: listModel; roleName: "name" } + colorSource: Charts.ModelSource { model: listModel; roleName: "color" } + } + } + function test_create_data() { return [ { tag: "minimal", component: minimal }, - { tag: "simple", component: simple } + { tag: "simple", component: simple }, + { tag: "multiValue", component: multiValue }, + { tag: "model", component: model } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.66.0/examples/snippets/piechart.qml new/kquickcharts-5.67.0/examples/snippets/piechart.qml --- old/kquickcharts-5.66.0/examples/snippets/piechart.qml 2020-01-04 00:13:46.000000000 +0100 +++ new/kquickcharts-5.67.0/examples/snippets/piechart.qml 2020-02-01 10:06:28.000000000 +0100 @@ -31,20 +31,18 @@ valueSources: Charts.ModelSource { roleName: "data"; - model: listModel + model: ListModel { + id: listModel + ListElement { data: 12 } + ListElement { data: 19 } + ListElement { data: 10 } + ListElement { data: 13 } + ListElement { data: 13 } + } } colorSource: Charts.ArraySource { array: ["red", "green", "blue", "yellow", "cyan"] } nameSource: Charts.ArraySource { array: ["Red", "Green", "Blue", "Yellow", "Cyan"] } thickness: 50 - - ListModel { - id: listModel - ListElement { data: 12 } - ListElement { data: 19 } - ListElement { data: 10 } - ListElement { data: 13 } - ListElement { data: 13 } - } } //! [example] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.66.0/src/ChartsPlugin.cpp new/kquickcharts-5.67.0/src/ChartsPlugin.cpp --- old/kquickcharts-5.66.0/src/ChartsPlugin.cpp 2020-01-04 00:13:46.000000000 +0100 +++ new/kquickcharts-5.67.0/src/ChartsPlugin.cpp 2020-02-01 10:06:28.000000000 +0100 @@ -51,6 +51,12 @@ Q_INIT_RESOURCE(shaders); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + qmlRegisterAnonymousType<QAbstractItemModel>(uri, 1); +#else + qmlRegisterType<QAbstractItemModel>(); +#endif + qmlRegisterType<PieChart>(uri, 1, 0, "PieChart"); qmlRegisterType<LineChart>(uri, 1, 0, "LineChart"); qmlRegisterType<BarChart>(uri, 1, 0, "BarChart"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.66.0/src/scenegraph/LineChartNode.cpp new/kquickcharts-5.67.0/src/scenegraph/LineChartNode.cpp --- old/kquickcharts-5.66.0/src/scenegraph/LineChartNode.cpp 2020-01-04 00:13:46.000000000 +0100 +++ new/kquickcharts-5.67.0/src/scenegraph/LineChartNode.cpp 2020-02-01 10:06:28.000000000 +0100 @@ -31,6 +31,10 @@ qreal calculateNormalizedLineWidth(qreal pixelWidth, const QRectF &rect) { + if (qFuzzyIsNull(pixelWidth)) { + return 0.0; + } + qreal min = 0.6 / std::max(rect.width(), rect.height()); return std::max(min, (pixelWidth - 1.0) / (std::min(rect.width(), rect.height()) * 4.0)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.66.0/src/shaders/linechart.frag new/kquickcharts-5.67.0/src/shaders/linechart.frag --- old/kquickcharts-5.66.0/src/shaders/linechart.frag 2020-01-04 00:13:46.000000000 +0100 +++ new/kquickcharts-5.67.0/src/shaders/linechart.frag 2020-02-01 10:06:28.000000000 +0100 @@ -46,7 +46,9 @@ color = sdf_render(polygon, color, fillColor, 0.001); - color = sdf_render(sdf_annular(sdf_outline(polygon), lineWidth), color, lineColor, 0.0004); + if (lineWidth > 0) { + color = sdf_render(sdf_annular(sdf_outline(polygon), lineWidth), color, lineColor, 0.0002); + } gl_FragColor = color * opacity; }
