[kdenlive] Add build fix for gcc-7 changes

commit e26942b00a16bc3efa0898f213539fd4ee0128ea Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Wed Feb 22 19:06:27 2017 +0000 Add build fix for gcc-7 changes gcc7.patch | 21 +++++++++++++++++++++ kdenlive.spec | 8 ++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) --- diff --git a/gcc7.patch b/gcc7.patch new file mode 100644 index 0000000..f751912 --- /dev/null +++ b/gcc7.patch @@ -0,0 +1,21 @@ +--- a/src/scopes/audioscopes/spectrogram.cpp ++++ b/src/scopes/audioscopes/spectrogram.cpp +@@ -245,7 +245,7 @@ + x = leftDist + (m_innerScopeRect.width()-1) * ((float)hz)/m_freqMax; + + // Hide text if it would overlap with the text drawn at the mouse position +- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 20)) < (int) minDistX + 16 ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && (x-(leftDist + mouseX + 20)) < (int) minDistX + 16 + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + + if (x <= rightBorder) { +@@ -273,7 +273,7 @@ + } + // Draw the line at the very right (maximum frequency) + x = leftDist + m_innerScopeRect.width()-1; +- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 30)) < (int) minDistX ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && (x-(leftDist + mouseX + 30)) < (int) minDistX + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height()+6); + if (!hideText) { + diff --git a/kdenlive.spec b/kdenlive.spec index 0f9645a..bb4f7c9 100644 --- a/kdenlive.spec +++ b/kdenlive.spec @@ -2,7 +2,7 @@ Name: kdenlive Summary: Non-linear video editor Version: 16.12.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.kdenlive.org @@ -13,6 +13,7 @@ URL: http://www.kdenlive.org %global stable stable %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/kdenlive-%{... +Patch0: gcc7.patch BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules @@ -75,7 +76,7 @@ recent video technologies. %prep -%setup -q +%autosetup -p1 %build @@ -139,6 +140,9 @@ fi %changelog +* Wed Feb 22 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 16.12.2-2 +- Add build fix for gcc-7 changes + * Tue Feb 21 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 16.12.2-1 - Update kdenlive to 16.12.2 following Fedora KDE applications