summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornfnty2020-12-01 14:32:04 +0000
committernfnty2020-12-01 14:32:04 +0000
commitda17036568de1e45799ebefec12664bde7df6ee3 (patch)
treee308ab2df64e7ee9d2547f719f142862e9650e96
parentdf57c6fff563316afc49916d708bbba117cb91b1 (diff)
downloadaur-da17036568de1e45799ebefec12664bde7df6ee3.tar.gz
Remove `melt.patch`
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD18
-rw-r--r--melt.patch13
3 files changed, 4 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cedee849f12..8768f8359162 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = shotcut-git
pkgdesc = Video editor
- pkgver = r2732
+ pkgver = r4252
pkgrel = 1
url = https://github.com/mltframework/shotcut
arch = i686
@@ -27,8 +27,6 @@ pkgbase = shotcut-git
provides = shotcut
conflicts = shotcut
source = shotcut::git+https://github.com/mltframework/shotcut.git
- source = melt.patch
- sha512sums = SKIP
sha512sums = SKIP
pkgname = shotcut-git
diff --git a/PKGBUILD b/PKGBUILD
index 6955a7c92f47..078ed97cd212 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=('shotcut-git')
_srcname='shotcut'
pkgdesc='Video editor'
-pkgver='r2732'
+pkgver='r4252'
pkgrel='1'
arch=('i686' 'x86_64')
url='https://github.com/mltframework/shotcut'
@@ -30,14 +30,8 @@ makedepends=('git' 'qt5-tools')
provides=("${pkgname[0]%-git}")
conflicts=("${pkgname[0]%-git}")
-source=(
- "${_srcname}::git+${url}.git"
- 'melt.patch'
-)
-sha512sums=(
- 'SKIP'
- 'SKIP'
-)
+source=("${_srcname}::git+${url}.git")
+sha512sums=('SKIP')
pkgver() {
cd "${srcdir}/${_srcname}"
@@ -48,12 +42,6 @@ pkgver() {
"$( git rev-parse --short 'HEAD' )"
}
-prepare() {
- cd "${srcdir}/${_srcname}"
-
- git apply "${srcdir}/melt.patch"
-}
-
build() {
cd "${srcdir}/${_srcname}"
diff --git a/melt.patch b/melt.patch
deleted file mode 100644
index 902681fc3eea..000000000000
--- a/melt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp
-index f5390e4..693a089 100644
---- a/src/jobs/meltjob.cpp
-+++ b/src/jobs/meltjob.cpp
-@@ -50,7 +50,7 @@ void MeltJob::start()
- #ifdef Q_OS_WIN
- QFileInfo meltPath(shotcutPath, "qmelt.exe");
- #else
-- QFileInfo meltPath(shotcutPath, "qmelt");
-+ QFileInfo meltPath(shotcutPath, "melt");
- #endif
- setReadChannel(QProcess::StandardError);
- QStringList args;