From 7f01241eb629fca4bef1a2d80a705a802e6a25c8 Mon Sep 17 00:00:00 2001 From: spider-mario Date: Mon, 4 Jun 2018 21:28:27 +0200 Subject: [PATCH] shotcut: Fix for Qt 5.11 Fixes #31 Fixes #32 --- shotcut/shotcut/PKGBUILD | 5 ++++- shotcut/shotcut/qt-5.11.patch | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 shotcut/shotcut/qt-5.11.patch diff --git a/shotcut/shotcut/PKGBUILD b/shotcut/shotcut/PKGBUILD index 7f199bda..328981f7 100644 --- a/shotcut/shotcut/PKGBUILD +++ b/shotcut/shotcut/PKGBUILD @@ -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') @@ -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() { diff --git a/shotcut/shotcut/qt-5.11.patch b/shotcut/shotcut/qt-5.11.patch new file mode 100644 index 00000000..0103bf5a --- /dev/null +++ b/shotcut/shotcut/qt-5.11.patch @@ -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 + #include + #include + #include +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 + #include + #include + #include