summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2018-07-03 13:34:51 +0100
committernfnty2018-07-03 13:35:28 +0100
commitb4ad226138240e8fc74c28b9f5452e7f5c640615 (patch)
treef5e422afd575f26e687af88afeb5a04e6c416a5a
parent93ef30473a3453c194cf3297b071e2491a0a2753 (diff)
downloadaur-b4ad226138240e8fc74c28b9f5452e7f5c640615.tar.gz
Remove Qt 5.11 patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--qt-5.11.patch24
3 files changed, 2 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ff3e3857c5e..c69773135351 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = shotcut-git
pkgdesc = Video editor
- pkgver = r2604
+ pkgver = r2679
pkgrel = 1
url = https://github.com/mltframework/shotcut
arch = i686
@@ -29,8 +29,6 @@ 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 5e6a5474ea9e..5f1371585a7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=('shotcut-git')
_srcname='shotcut'
pkgdesc='Video editor'
-pkgver='r2604'
+pkgver='r2679'
pkgrel='1'
arch=('i686' 'x86_64')
url='https://github.com/mltframework/shotcut'
@@ -34,13 +34,11 @@ source=(
"${_srcname}::git+${url}.git"
'shotcut.desktop'
'melt.patch'
- 'qt-5.11.patch'
)
sha512sums=(
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
)
pkgver() {
@@ -56,7 +54,6 @@ 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
deleted file mode 100644
index 0103bf5acac8..000000000000
--- a/qt-5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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>