diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-05-21 23:03:48 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-05-21 23:03:48 +0200 |
| commit | f330386a0b9f625a21c38f48b3a02add8993d454 (patch) | |
| tree | 8de983f18c97a0792c04fc2639126e5ee3465126 /kde/patch/kdenlive/kdenlive_gcc7.patch | |
| parent | 337a2c550c9ce9dce447ffc7117524fc0ca33fc9 (diff) | |
| download | ktown-f330386a0b9f625a21c38f48b3a02add8993d454.tar.gz ktown-f330386a0b9f625a21c38f48b3a02add8993d454.tar.xz | |
Prepare for KDE 5_17.05_02 for Slackware
Diffstat (limited to 'kde/patch/kdenlive/kdenlive_gcc7.patch')
| -rw-r--r-- | kde/patch/kdenlive/kdenlive_gcc7.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kde/patch/kdenlive/kdenlive_gcc7.patch b/kde/patch/kdenlive/kdenlive_gcc7.patch new file mode 100644 index 0000000..a7ddb90 --- /dev/null +++ b/kde/patch/kdenlive/kdenlive_gcc7.patch @@ -0,0 +1,32 @@ +# Make kdenlive compile with gcc7 + +--- kdenlive-17.04.1/src/profiles/tree/profiletreemodel.cpp.orig 2017-05-08 19:52:35.000000000 +0200 ++++ kdenlive-17.04.1/src/profiles/tree/profiletreemodel.cpp 2017-05-19 08:09:04.986909338 +0200 +@@ -27,6 +27,7 @@ + #include <QVector> + #include <array> + #include <KLocalizedString> ++#include <functional> + + + class ProfileItem +--- kdenlive-17.04.1/src/scopes/audioscopes/spectrogram.cpp.orig 2017-05-08 19:52:35.000000000 +0200 ++++ kdenlive-17.04.1/src/scopes/audioscopes/spectrogram.cpp 2017-05-19 08:09:04.993910503 +0200 +@@ -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(x - ((int)leftDist + mouseX + 20)) < (int) minDistX + 16 + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + + if (x <= rightBorder) { +@@ -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(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) { |