Skip to content

Commit

Permalink
shotcut: Fix for Qt 5.11
Browse files Browse the repository at this point in the history
Fixes #31
Fixes #32
  • Loading branch information
spider-mario authored and nfnty committed Jun 4, 2018
1 parent c167265 commit 7f01241
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
5 changes: 4 additions & 1 deletion shotcut/shotcut/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _srcname='shotcut'
pkgdesc='Video editor'
pkgver='18.06.02'
_commit='d06c470df30b17fdf90861726d6e1d7a52795e2c'
pkgrel='1'
pkgrel='2'
arch=('i686' 'x86_64')
url='https://www.shotcut.org/'
license=('GPL3')
Expand Down Expand Up @@ -35,17 +35,20 @@ source=(
"${_srcname}::git+https://github.com/mltframework/shotcut.git#commit=${_commit}"
'shotcut.desktop'
'melt.patch'
'qt-5.11.patch'
)
sha512sums=(
'SKIP'
'SKIP'
'SKIP'
'SKIP'
)

prepare() {
cd "${srcdir}/${_srcname}"

git apply "${srcdir}/melt.patch"
git apply "${srcdir}/qt-5.11.patch"
}

build() {
Expand Down
24 changes: 24 additions & 0 deletions shotcut/shotcut/qt-5.11.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/src/docks/recentdock.cpp b/src/docks/recentdock.cpp
index e4a629ff..a00078ba 100644
--- a/src/docks/recentdock.cpp
+++ b/src/docks/recentdock.cpp
@@ -21,6 +21,7 @@
#include "ui_recentdock.h"
#include "util.h"

+#include <QAction>
#include <QDir>
#include <QKeyEvent>
#include <Logger.h>
diff --git a/src/docks/timelinedock.cpp b/src/docks/timelinedock.cpp
index 72e23d63..57752424 100644
--- a/src/docks/timelinedock.cpp
+++ b/src/docks/timelinedock.cpp
@@ -28,6 +28,7 @@
#include "shotcut_mlt_properties.h"
#include "settings.h"

+#include <QAction>
#include <QtQml>
#include <QtQuick>
#include <Logger.h>

0 comments on commit 7f01241

Please sign in to comment.