summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2018-06-04 22:25:27 +0200
committernfnty2018-06-04 22:25:27 +0200
commit93ef30473a3453c194cf3297b071e2491a0a2753 (patch)
treee4c35ab30252ef8dc514a30d0611a9a7cf774add
parent8465f8262e0e5c3e1e5cdb7baafdb099afaff52e (diff)
downloadaur-93ef30473a3453c194cf3297b071e2491a0a2753.tar.gz
Fix for Qt 5.11
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD7
-rw-r--r--qt-5.11.patch24
3 files changed, 33 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 58ce4cadafb8..3ff3e3857c5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = shotcut-git
pkgdesc = Video editor
- pkgver = r2235
+ pkgver = r2604
pkgrel = 1
url = https://github.com/mltframework/shotcut
arch = i686
arch = x86_64
license = GPL3
makedepends = git
+ makedepends = qt5-tools
depends = qt5-base
depends = qt5-declarative
depends = qt5-graphicaleffects
@@ -28,6 +29,8 @@ pkgbase = shotcut-git
source = shotcut::git+https://github.com/mltframework/shotcut.git
source = shotcut.desktop
source = melt.patch
+ source = qt-5.11.patch
+ sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a68ca60ad754..5e6a5474ea9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=('shotcut-git')
_srcname='shotcut'
pkgdesc='Video editor'
-pkgver='r2235'
+pkgver='r2604'
pkgrel='1'
arch=('i686' 'x86_64')
url='https://github.com/mltframework/shotcut'
@@ -26,7 +26,7 @@ depends=(
'frei0r-plugins'
'ladspa'
)
-makedepends=('git')
+makedepends=('git' 'qt5-tools')
provides=("${pkgname[0]%-git}")
conflicts=("${pkgname[0]%-git}")
@@ -34,11 +34,13 @@ source=(
"${_srcname}::git+${url}.git"
'shotcut.desktop'
'melt.patch'
+ 'qt-5.11.patch'
)
sha512sums=(
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
)
pkgver() {
@@ -54,6 +56,7 @@ prepare() {
cd "${srcdir}/${_srcname}"
git apply "${srcdir}/melt.patch"
+ git apply "${srcdir}/qt-5.11.patch"
}
build() {
diff --git a/qt-5.11.patch b/qt-5.11.patch
new file mode 100644
index 000000000000..0103bf5acac8
--- /dev/null
+++ b/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 <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>