git » kdenlive.git » commit e906071

KDE Applications 17.04.3

author Antonio Rojas
2017-07-13 13:59:22 UTC
committer Antonio Rojas
2017-07-13 13:59:22 UTC
parent 589a135cc5e99b00609c96ec0f84ec9d1dced878

KDE Applications 17.04.3

PKGBUILD +6 -11
kdenlive-gcc7.patch +0 -33

diff --git a/PKGBUILD b/PKGBUILD
index 3ed78c9..a362429 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=kdenlive
-pkgver=17.04.2
+pkgver=17.04.3
 pkgrel=1
 pkgdesc="A non-linear video editor for Linux using the MLT video framework"
 arch=(i686 x86_64)
@@ -23,19 +23,14 @@ optdepends=('ffmpeg: for FFmpeg plugin'
             'xine-ui: for DVD preview'
             'vlc: for DVD preview'
             'plasma-desktop: theme configuration')
-source=("https://download.kde.org/stable/applications/${pkgver}/src/$pkgname-${pkgver}.tar.xz"{,.sig}
-        kdenlive-gcc7.patch)
-sha256sums=('29ce6a4b3b86e20b8eac5332a22067dc8fbde297d6bc144f722bcbb64856fccb'
-            'SKIP'
-            '867f3e4fe5f8d7c5ab19bb1d0af321bc9012abb7099149653ba37a49cd76784f')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
+source=("https://download.kde.org/stable/applications/${pkgver}/src/$pkgname-${pkgver}.tar.xz"{,.sig})
+sha256sums=('85ec8ee9b110a6d16b5ba82b5218894bd99c0a10d49c3126057c8298af089dd8'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-# Fix build with GCC 7 (rpmfusion)
-  patch -p1 -i ../kdenlive-gcc7.patch
 }
 
 build() {
diff --git a/kdenlive-gcc7.patch b/kdenlive-gcc7.patch
deleted file mode 100644
index d91b214..0000000
--- a/kdenlive-gcc7.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/profiles/tree/profiletreemodel.cpp b/src/profiles/tree/profiletreemodel.cpp
-index 47a580703..912279494 100644
---- a/src/profiles/tree/profiletreemodel.cpp
-+++ b/src/profiles/tree/profiletreemodel.cpp
-@@ -26,6 +26,7 @@
- #include <vector>
- #include <QVector>
- #include <array>
-+#include <functional>
- #include <KLocalizedString>
- 
- 
---- 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 && abs((int)(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 && abs((int)(x - (leftDist + mouseX + 30))) < (int) minDistX
-                        && mouseX < m_innerScopeRect.width() && mouseX >= 0;
-             davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height() + 6);
-             if (!hideText) {
-