commit: 9bae7efc95161d0f4f56b9c83a61643ac3b8f802 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 24 16:20:13 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 24 16:20:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bae7efc
kde-apps/kdenlive: Fix build with GCC-7 Upstream commit 2ed43d34a124609aef092164e2e58e5476228209 Gentoo-bug: 618070 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../kdenlive/files/kdenlive-17.04.2-gcc7.patch | 35 ++++++++++++++++++++++ kde-apps/kdenlive/kdenlive-17.04.2.ebuild | 2 ++ 2 files changed, 37 insertions(+) diff --git a/kde-apps/kdenlive/files/kdenlive-17.04.2-gcc7.patch b/kde-apps/kdenlive/files/kdenlive-17.04.2-gcc7.patch new file mode 100644 index 00000000000..3499d7feab7 --- /dev/null +++ b/kde-apps/kdenlive/files/kdenlive-17.04.2-gcc7.patch @@ -0,0 +1,35 @@ +From 2ed43d34a124609aef092164e2e58e5476228209 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Mardelle <[email protected]> +Date: Mon, 19 Jun 2017 13:21:16 +0200 +Subject: Fix compilation + +--- + src/scopes/audioscopes/spectrogram.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/scopes/audioscopes/spectrogram.cpp b/src/scopes/audioscopes/spectrogram.cpp +index 1d3a0a2..244e137 100644 +--- a/src/scopes/audioscopes/spectrogram.cpp ++++ b/src/scopes/audioscopes/spectrogram.cpp +@@ -241,8 +241,8 @@ QImage Spectrogram::renderHUD(uint) + 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 +- && mouseX < m_innerScopeRect.width() && mouseX >= 0; ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x - (int)(leftDist + mouseX + 20)) < (int) minDistX + 16 ++ && mouseX < m_innerScopeRect.width() && mouseX >= 0; + + if (x <= rightBorder) { + davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height() + 6); +@@ -268,7 +268,7 @@ QImage Spectrogram::renderHUD(uint) + } + // 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 && qAbs(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) { +-- +cgit v0.11.2 diff --git a/kde-apps/kdenlive/kdenlive-17.04.2.ebuild b/kde-apps/kdenlive/kdenlive-17.04.2.ebuild index 563c0c6efd4..2135d841c8d 100644 --- a/kde-apps/kdenlive/kdenlive-17.04.2.ebuild +++ b/kde-apps/kdenlive/kdenlive-17.04.2.ebuild @@ -56,6 +56,8 @@ DEPEND="${RDEPEND} sys-devel/gettext " +PATCHES=( "${FILESDIR}/${P}-gcc7.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
