[kdenlive] yet another fix for gcc7

commit 40f46f051483c76e022b2493aada86999c3d8e5c Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Jun 16 14:15:13 2017 +0100 yet another fix for gcc7 gcc7.patch | 26 ++++++++++++++++++++------ kdenlive.spec | 5 ++++- 2 files changed, 24 insertions(+), 7 deletions(-) --- diff --git a/gcc7.patch b/gcc7.patch index 349d314..7958821 100644 --- a/gcc7.patch +++ b/gcc7.patch @@ -1,20 +1,34 @@ ---- ./src/scopes/audioscopes/spectrogram.cpp.orig 2017-06-12 01:07:02.501917132 +0100 -+++ ./src/scopes/audioscopes/spectrogram.cpp 2017-06-12 01:09:41.261714228 +0100 -@@ -241,7 +241,7 @@ QImage Spectrogram::renderHUD(uint) +https://bugs.kde.org/show_bug.cgi?id=379688 + +diff -Naur kdenlive-17.04.1.orig/src/profiles/tree/profiletreemodel.cpp kdenlive-17.04.1/src/profiles/tree/profiletreemodel.cpp +--- kdenlive-17.04.1.orig/src/profiles/tree/profiletreemodel.cpp 2017-05-08 12:52:35.000000000 -0500 ++++ kdenlive-17.04.1/src/profiles/tree/profiletreemodel.cpp 2017-06-09 16:22:04.541100531 -0500 +@@ -27,6 +27,7 @@ + #include <QVector> + #include <array> + #include <KLocalizedString> ++#include <functional> + + + class ProfileItem +diff -Naur kdenlive-17.04.1.orig/src/scopes/audioscopes/spectrogram.cpp kdenlive-17.04.1/src/scopes/audioscopes/spectrogram.cpp +--- kdenlive-17.04.1.orig/src/scopes/audioscopes/spectrogram.cpp 2017-05-08 12:52:35.000000000 -0500 ++++ kdenlive-17.04.1/src/scopes/audioscopes/spectrogram.cpp 2017-06-09 16:22:14.560138010 -0500 +@@ -241,7 +241,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 && abs((int)(x - (leftDist + mouseX + 20))) < (int) minDistX + 16 ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - ((int)leftDist + mouseX + 20)) < (int) minDistX + 16 && mouseX < m_innerScopeRect.width() && mouseX >= 0; if (x <= rightBorder) { -@@ -268,7 +268,7 @@ QImage Spectrogram::renderHUD(uint) +@@ -268,7 +268,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 && abs((int)(x - (leftDist + mouseX + 30))) < (int) minDistX ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - ((int)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 eb615c1..3fb493e 100644 --- a/kdenlive.spec +++ b/kdenlive.spec @@ -2,7 +2,7 @@ Name: kdenlive Summary: Non-linear video editor Version: 17.04.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.kdenlive.org @@ -141,6 +141,9 @@ fi %changelog +* Fri Jun 16 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 17.04.2-3 +- yet another fix for gcc7 + * Sun Jun 11 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 17.04.2-2 - Add a new gcc7.patch - Add find_lang macro