From 2ff1bdbd8042c575ee96047fbd38a89562ecca89505c2c670faf6230aff0c908 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 10 Oct 2018 15:02:11 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=88 --- minuet.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/minuet.changes b/minuet.changes index db40028..074674a 100644 --- a/minuet.changes +++ b/minuet.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 10 15:01:36 UTC 2018 - wbauer@tmo.at + +- Add Fix-bug-when-highlighting-selected-notes.patch to fix note + display in Piano view + ------------------------------------------------------------------- Thu Sep 06 18:43:13 UTC 2018 - lbeltrame@kde.org From 48a6a9210a2fd3ff3bf236a83cf91a3a3b59bbf4653f0351ea38da338f5b74ee Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 10 Oct 2018 15:14:30 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=89 --- minuet.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minuet.changes b/minuet.changes index 074674a..40da495 100644 --- a/minuet.changes +++ b/minuet.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Wed Oct 10 15:01:36 UTC 2018 - wbauer@tmo.at -- Add Fix-bug-when-highlighting-selected-notes.patch to fix note - display in Piano view +- Add Fix-bug-when-highlighting-selected-notes.patch to fix broken + note display in piano view ------------------------------------------------------------------- Thu Sep 06 18:43:13 UTC 2018 - lbeltrame@kde.org From a8f3510989c8895b6309263c7285fc5e1963a847ebc862e2cda1ff6016b28dbd Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 10 Oct 2018 15:56:10 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=90 --- minuet.changes | 6 ------ 1 file changed, 6 deletions(-) diff --git a/minuet.changes b/minuet.changes index 40da495..db40028 100644 --- a/minuet.changes +++ b/minuet.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Oct 10 15:01:36 UTC 2018 - wbauer@tmo.at - -- Add Fix-bug-when-highlighting-selected-notes.patch to fix broken - note display in piano view - ------------------------------------------------------------------- Thu Sep 06 18:43:13 UTC 2018 - lbeltrame@kde.org From 7ff15236d4d4b6fc8ae467322d6992a9144d644da4f716a5611fa8689832a31d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 10 Oct 2018 18:38:23 +0000 Subject: [PATCH 4/4] Accepting request 641102 from home:wolfi323:branches:KDE:Applications - Add Fix-bug-when-highlighting-selected-notes.patch to fix broken note display in piano view with current Qt versions - Update build requirements OBS-URL: https://build.opensuse.org/request/show/641102 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=91 --- ...bug-when-highlighting-selected-notes.patch | 34 +++++++++++++++++++ minuet.changes | 7 ++++ minuet.spec | 10 +++--- 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 Fix-bug-when-highlighting-selected-notes.patch diff --git a/Fix-bug-when-highlighting-selected-notes.patch b/Fix-bug-when-highlighting-selected-notes.patch new file mode 100644 index 0000000..c9ca739 --- /dev/null +++ b/Fix-bug-when-highlighting-selected-notes.patch @@ -0,0 +1,34 @@ +From 3bf2f5e93d078e8215c47a4b4e3f7e240b943060 Mon Sep 17 00:00:00 2001 +From: "Sandro S. Andrade" +Date: Sun, 30 Sep 2018 12:13:10 -0300 +Subject: Fix bug when highlighting selected notes + +--- + src/app/qml/PianoView/PianoView.qml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/app/qml/PianoView/PianoView.qml b/src/app/qml/PianoView/PianoView.qml +index 90b3218..da3a78b 100644 +--- a/src/app/qml/PianoView/PianoView.qml ++++ b/src/app/qml/PianoView/PianoView.qml +@@ -45,7 +45,7 @@ Flickable { + highlightKey(pitch, ([1,3,6,8,10].indexOf(pitch % 12) > -1) ? "black":"white") + } + function noteMark(chan, pitch, vel, color) { +- noteMark.createObject(itemForPitch(pitch), { color: color }) ++ noteMarkComponent.createObject(itemForPitch(pitch), { color: color }) + } + function noteUnmark(chan, pitch, vel, color) { + if(itemForPitch(pitch)!= undefined){ +@@ -133,7 +133,7 @@ Flickable { + } + + Component { +- id: noteMark ++ id: noteMarkComponent + + Rectangle { + width: keyWidth - 4; height: keyWidth - 4 +-- +cgit v0.11.2 + diff --git a/minuet.changes b/minuet.changes index db40028..3cd7632 100644 --- a/minuet.changes +++ b/minuet.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 10 15:56:28 UTC 2018 - wbauer@tmo.at + +- Add Fix-bug-when-highlighting-selected-notes.patch to fix broken + note display in piano view with current Qt versions +- Update build requirements + ------------------------------------------------------------------- Thu Sep 06 18:43:13 UTC 2018 - lbeltrame@kde.org diff --git a/minuet.spec b/minuet.spec index ef4c26b..f028c11 100644 --- a/minuet.spec +++ b/minuet.spec @@ -29,23 +29,22 @@ License: GPL-2.0-or-later Group: Productivity/Other Url: http://www.kde.org Source: minuet-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: Fix-bug-when-highlighting-selected-notes.patch BuildRequires: extra-cmake-modules >= 5.15.0 BuildRequires: kf5-filesystem BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) BuildRequires: cmake(Qt5Core) >= 5.7.0 +BuildRequires: cmake(Qt5Gui) >= 5.7.0 +BuildRequires: cmake(Qt5Qml) >= 5.7.0 BuildRequires: cmake(Qt5Quick) >= 5.7.0 BuildRequires: cmake(Qt5QuickControls2) >= 5.7.0 BuildRequires: cmake(Qt5Svg) >= 5.7.0 -BuildRequires: cmake(Qt5Widgets) >= 5.7.0 BuildRequires: pkgconfig(fluidsynth) # Runtime requirement Requires: libqt5-qtquickcontrols2 @@ -74,6 +73,7 @@ Development headers and libraries for Minuet. %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build