Update to 4.22

- remove now unecessary patch
- add compilation of Script Editor

3 files changed, 14 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f40ca089b1b8..86229da25b90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = script-communicator
 	pkgdesc = ScriptCommunicator is a scriptable terminal with Serial/TCP/UDP/SPI/CAN support
-	pkgver = 4.18
+	pkgver = 4.22
 	pkgrel = 1
 	url = http://sourceforge.net/projects/scriptcommunicator/
 	arch = i686
@@ -9,11 +9,9 @@ pkgbase = script-communicator
 	makedepends = qt5-tools
 	depends = qt5-script
 	depends = qt5-serialport
-	source = https://github.com/szieke/ScriptCommunicator_serial-terminal/archive/Release_04_18.zip
-	source = qmake.patch
+	source = https://github.com/szieke/ScriptCommunicator_serial-terminal/archive/Release_04_22.zip
 	source = script-communicator.desktop
-	sha256sums = 804f42ec28de0c95d772ad1a864301d73c3e5221f92102848f087c8793174be5
-	sha256sums = 42d4c91d7313281e41588d7d75016ab30695bf057e81197fa09a904cb3311b6e
+	sha256sums = 322e5d502ce4db24ec68b9d9dac153b5010b43722e6d2e56116521a5a9245bd5
 	sha256sums = a6ff5c6079a0af0c5bc47c8f660073fcfc31c22a68b57d98f454542aaa560566
 
 pkgname = script-communicator
diff --git a/PKGBUILD b/PKGBUILD
index efb72175e161..d486379533c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Jake <ja.ke@posteo.de>
 pkgname=script-communicator
-pkgver=4.18
+pkgver=4.22
 _pkgver=0${pkgver/./_}
 pkgrel=1
 pkgdesc="ScriptCommunicator is a scriptable terminal with Serial/TCP/UDP/SPI/CAN support"
@@ -11,23 +11,25 @@ depends=('qt5-script' 'qt5-serialport')
 makedepends=('qt5-tools')
 
 source=("https://github.com/szieke/ScriptCommunicator_serial-terminal/archive/Release_${_pkgver}.zip" 
-	"qmake.patch"
 	"$pkgname.desktop")
-sha256sums=('804f42ec28de0c95d772ad1a864301d73c3e5221f92102848f087c8793174be5'
-            '42d4c91d7313281e41588d7d75016ab30695bf057e81197fa09a904cb3311b6e'
+sha256sums=('322e5d502ce4db24ec68b9d9dac153b5010b43722e6d2e56116521a5a9245bd5'
             'a6ff5c6079a0af0c5bc47c8f660073fcfc31c22a68b57d98f454542aaa560566')
 
 
 prepare() {
 	mv ScriptCommunicator_serial-terminal-Release_${_pkgver}/ScriptCommunicator/ ${pkgname}
 	cd $pkgname
-	patch -i "$srcdir/qmake.patch"
+	echo "DESTDIR = build" >> ScriptCommunicator.pro
+	echo "DESTDIR = build" >> ScriptEditor/ScriptEditor.pro
 }
 
 build() {
 	cd $pkgname
 	qmake -o Makefile ScriptCommunicator.pro
 	make --no-print-directory
+	cd ScriptEditor/
+        qmake -o Makefile ScriptEditor.pro
+	make --no-print-directory
 }
 
 
@@ -42,4 +44,8 @@ package() {
 	mkdir -p "$pkgdir/usr/bin"
 	ln -s "/opt/$pkgname/ScriptCommunicator" "$pkgdir/usr/bin/$pkgname"
 	cp -r templates exampleScripts documentation "$pkgdir/opt/$pkgname/"
+	
+	cd ScriptEditor/
+	install -Dm755 "build/ScriptEditor" "$pkgdir/opt/$pkgname/"
+	ln -s "/opt/$pkgname/ScriptEditor" "$pkgdir/usr/bin/script-editor"
 }
diff --git a/qmake.patch b/qmake.patch
deleted file mode 100644
index 4c2c66fc8bb5..000000000000
--- a/qmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ScriptCommunicator.pro.orig	2016-01-30 12:31:38.549393000 +0100
-+++ ScriptCommunicator.pro	2016-01-30 12:35:04.715637257 +0100
-@@ -1,8 +1,8 @@
--greaterThan(QT_MAJOR_VERSION, 4) {
--    QT       += widgets serialport
--} else {
--    include($$QTSERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf)
--}
-+DESTDIR = build
-+OBJECTS_DIR = build/.obj
-+MOC_DIR = build/.moc
-+RCC_DIR = build/.rcc
-+UI_DIR = build/.ui
- 
- CONFIG += c++11
- 
-@@ -16,6 +16,7 @@
- QT += network
- QT += sql
- QT += scripttools
-+QT += widgets serialport
- 
- unix{
- LIBS += -ldl