From c389e03cc390846ddadbce3667392a90b419cdbd48630d0d1066e60836835148 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 21 Dec 2017 14:14:23 +0000 Subject: [PATCH] Accepting request 559107 from home:wolfi323:branches:KDE:Applications - Add Add-missing-types-to-qmldir.patch to fix ktouch not starting with Qt 5.10 OBS-URL: https://build.opensuse.org/request/show/559107 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kqtquickcharts?expand=0&rev=60 --- Add-missing-types-to-qmldir.patch | 26 ++++++++++++++++++++++++++ kqtquickcharts.changes | 6 ++++++ kqtquickcharts.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 Add-missing-types-to-qmldir.patch diff --git a/Add-missing-types-to-qmldir.patch b/Add-missing-types-to-qmldir.patch new file mode 100644 index 0000000..66e03cd --- /dev/null +++ b/Add-missing-types-to-qmldir.patch @@ -0,0 +1,26 @@ +From 4e90e87e7522230387c1bdf7b95d8177ea3a7486 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Wed, 20 Dec 2017 21:09:26 +0100 +Subject: Add missing types to qmldir + +Otherwise ktouch will refuse to load with Qt 5.10, which seems to be more strict with respect to QML files loading. + +Differential Revision: https://phabricator.kde.org/D9436 +--- + src/qml/qmldir | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/qml/qmldir b/src/qml/qmldir +index 41359d9..780493f 100644 +--- a/src/qml/qmldir ++++ b/src/qml/qmldir +@@ -3,4 +3,6 @@ + LineChart 0.1 LineChart.qml + LegendItem 0.1 LegendItem.qml + XYChart 0.1 XYChart.qml ++internal Label Label.qml ++internal LineLabel LineLabel.qml + plugin kqtquickcharts +-- +cgit v0.11.2 + diff --git a/kqtquickcharts.changes b/kqtquickcharts.changes index b7cbafe..bc0be9f 100644 --- a/kqtquickcharts.changes +++ b/kqtquickcharts.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 21 12:45:16 UTC 2017 - wbauer@tmo.at + +- Add Add-missing-types-to-qmldir.patch to fix ktouch not starting + with Qt 5.10 + ------------------------------------------------------------------- Sat Dec 09 14:59:08 CET 2017 - lbeltrame@kde.org diff --git a/kqtquickcharts.spec b/kqtquickcharts.spec index 0343436..a2b8971 100644 --- a/kqtquickcharts.spec +++ b/kqtquickcharts.spec @@ -27,6 +27,8 @@ License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: Add-missing-types-to-qmldir.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig @@ -40,6 +42,7 @@ A QtQuick plugin to render beautiful and interactive graphs. %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build