summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake2018-10-27 14:40:43 +0200
committerJake2018-10-27 14:40:43 +0200
commit9876478a88c3d9da7dc46c49dcdb99e12f6eaad6 (patch)
tree825c371991af4f9072ed84d61712e92e98769c05
parentb2c4c8950edda3400a654d4625fb8c4031c6b18c (diff)
downloadaur-9876478a88c3d9da7dc46c49dcdb99e12f6eaad6.tar.gz
Update to 5.09
qt 5.11 patching not required anymore: https://github.com/szieke/ScriptCommunicator_serial-terminal/issues/19
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
-rw-r--r--qt5_11.patch17
3 files changed, 8 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3faefc28f505..ec1fba6f5d46 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 = 5.08
+ pkgver = 5.09
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_05_08.zip
- source = qt5_11.patch
+ source = https://github.com/szieke/ScriptCommunicator_serial-terminal/archive/Release_05_09.zip
source = script-communicator.desktop
- sha256sums = 712742470ad11470325c510eba56971351f1093cffde34f1d2f9ce3e377cefd3
- sha256sums = e6eb8097ecfd857b56070b33a588b2c1bcac25cd407cf22a6f72be0c72f2fb91
+ sha256sums = f66a4eb4cd685fd09850ea76902bdc3c5f93378c53ed9d79c8ba7e39f639ad81
sha256sums = a6ff5c6079a0af0c5bc47c8f660073fcfc31c22a68b57d98f454542aaa560566
pkgname = script-communicator
diff --git a/PKGBUILD b/PKGBUILD
index 987c3326df7e..a3242bfd8cba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Jake <ja.ke@posteo.de>
pkgname=script-communicator
-pkgver=5.08
+pkgver=5.09
_pkgver=0${pkgver/./_}
pkgrel=1
pkgdesc="ScriptCommunicator is a scriptable terminal with Serial/TCP/UDP/SPI/CAN support"
@@ -11,10 +11,8 @@ depends=('qt5-script' 'qt5-serialport')
makedepends=('qt5-tools')
source=("https://github.com/szieke/ScriptCommunicator_serial-terminal/archive/Release_${_pkgver}.zip"
- "qt5_11.patch"
- "$pkgname.desktop")
-sha256sums=('712742470ad11470325c510eba56971351f1093cffde34f1d2f9ce3e377cefd3'
- 'e6eb8097ecfd857b56070b33a588b2c1bcac25cd407cf22a6f72be0c72f2fb91'
+ "$pkgname.desktop")
+sha256sums=('f66a4eb4cd685fd09850ea76902bdc3c5f93378c53ed9d79c8ba7e39f639ad81'
'a6ff5c6079a0af0c5bc47c8f660073fcfc31c22a68b57d98f454542aaa560566')
@@ -23,15 +21,15 @@ prepare() {
cd $pkgname
echo "DESTDIR = build" >> ScriptCommunicator.pro
echo "DESTDIR = build" >> ScriptEditor/ScriptEditor.pro
- patch -Np2 -i ../qt5_11.patch
}
build() {
cd $pkgname
qmake -o Makefile ScriptCommunicator.pro
make --no-print-directory
+
cd ScriptEditor/
- qmake -o Makefile ScriptEditor.pro
+ qmake -o Makefile ScriptEditor.pro
make --no-print-directory
}
diff --git a/qt5_11.patch b/qt5_11.patch
deleted file mode 100644
index e7bde889d29b..000000000000
--- a/qt5_11.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From b006b2bc591b1ad55a4b25ec897037b80990e00f Mon Sep 17 00:00:00 2001
-From: szieke <s.zieker@gmx.net>
-Date: Sun, 17 Jun 2018 16:26:51 +0200
-Subject: [PATCH] Missing include for Qt5.11 added.
-
-diff --git a/ScriptCommunicator/settingsdialog.h b/ScriptCommunicator/settingsdialog.h
-index 7f6335b..bc4841e 100644
---- a/ScriptCommunicator/settingsdialog.h
-+++ b/ScriptCommunicator/settingsdialog.h
-@@ -34,6 +34,7 @@
- #include <QSignalMapper>
- #include "aardvark.h"
- #include "aardvarkI2cSpi.h"
-+#include <QAction>
-
-
- QT_USE_NAMESPACE