From 811dc9d536cb4587c708b81d4e8d026c87ccbde2 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Sun, 28 Jan 2018 01:39:10 +0200
Subject: [PATCH] vapoursynth-editor: update to r18

Closes: #11177 [via git-merge-pr]
---
 .../files/vapoursynth-editor.desktop          |  2 +-
 .../patches/project-file.patch                | 20 ++++++++++++++++++
 srcpkgs/vapoursynth-editor/template           | 21 +++++++------------
 3 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/vapoursynth-editor/patches/project-file.patch

diff --git a/srcpkgs/vapoursynth-editor/files/vapoursynth-editor.desktop b/srcpkgs/vapoursynth-editor/files/vapoursynth-editor.desktop
index fd1efcf848..e813e2ca27 100644
--- a/srcpkgs/vapoursynth-editor/files/vapoursynth-editor.desktop
+++ b/srcpkgs/vapoursynth-editor/files/vapoursynth-editor.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=VapourSynth Editor
 GenericName=vapoursynth-editor
-Comment="A cross-platform editor for VapourSynth script"
+Comment="A cross-platform editor for VapourSynth scripts"
 Icon=vsedit
 MimeType=text/x-vpy;
 Exec="/usr/bin/vsedit" %f
diff --git a/srcpkgs/vapoursynth-editor/patches/project-file.patch b/srcpkgs/vapoursynth-editor/patches/project-file.patch
new file mode 100644
index 0000000000..39aeacfeed
--- /dev/null
+++ b/srcpkgs/vapoursynth-editor/patches/project-file.patch
@@ -0,0 +1,20 @@
+diff --git pro/pro.pro pro/pro.pro
+index d698c82..cbc4f61 100644
+--- pro/pro.pro
++++ pro/pro.pro
+@@ -1,9 +1,9 @@
+ TEMPLATE = subdirs
+ 
+-SUBDIRS += vsedit
+-SUBDIRS += vsedit-job-server
+-SUBDIRS += vsedit-job-server-watcher
++SUBDIRS += pro/vsedit
++SUBDIRS += pro/vsedit-job-server
++SUBDIRS += pro/vsedit-job-server-watcher
+ 
+-vsedit.file = ./vsedit/vsedit.pro
+-vsedit-job-server.file = ./vsedit-job-server/vsedit-job-server.pro
+-vsedit-job-server-watcher.file = ./vsedit-job-server-watcher/vsedit-job-server-watcher.pro
++vsedit.file = pro/vsedit/vsedit.pro
++vsedit-job-server.file = pro/vsedit-job-server/vsedit-job-server.pro
++vsedit-job-server-watcher.file = pro/vsedit-job-server-watcher/vsedit-job-server-watcher.pro
diff --git a/srcpkgs/vapoursynth-editor/template b/srcpkgs/vapoursynth-editor/template
index 021caabd27..c3b75f0f1f 100644
--- a/srcpkgs/vapoursynth-editor/template
+++ b/srcpkgs/vapoursynth-editor/template
@@ -1,32 +1,26 @@
 # Template file for 'vapoursynth-editor'
 pkgname=vapoursynth-editor
-version=r16
+version=r18
 revision=1
-_bitbucket_hash=3a304dd94528
+_bitbucket_hash=a511db5a522c
 wrksrc="mystery_keeper-${pkgname}-${_bitbucket_hash}"
 build_style=qmake
 hostmakedepends="qt5-qmake"
-makedepends="vapoursynth-devel qt5-devel"
+makedepends="vapoursynth-devel qt5-devel qt5-websockets-devel"
 depends="vapoursynth"
 short_desc="A cross-platform editor for VapourSynth script"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://bitbucket.org/mystery_keeper/vapoursynth-editor"
 distfiles="${homepage}/get/${version}.tar.gz"
-checksum=e32dc3d425f8680b957fbd3427db6e4061fd1a2414db410ee75f2945aea00109
+checksum=7c560c1ef4ea1810babda30f11358e073ba471971a43a0252bc0ae04d3de901f
 
 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
+	hostmakedepends+=" qt5-host-tools qt5-devel qt5-websockets-devel"
 fi
 
-post_extract() {
-	cp pro/* .
-	# project file fixes
-	sed -i 's/\.\.\///' pro.pro
-	sed -i 's/\.\.\$/.\//' pro.pro
-	if [ "$ARCH" = "i686" ]; then
-		sed -i 's/TARGET = vsedit-32bit/TARGET = vsedit/' pro.pro
-	fi
+pre_configure() {
+	mv pro/pro.pro .
 }
 
 do_install() {
@@ -38,4 +32,3 @@ do_install() {
 	vinstall ${FILESDIR}/vapoursynth-editor.desktop 644 usr/share/applications/
 	vinstall resources/vsedit.svg 644 usr/share/pixmaps/
 }
-