Improve build

3 files changed, 4 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd2e93306ab1..de117709a9a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = easyssh
 	pkgdesc = SSH connection manager for Pantheon
 	pkgver = 1.3.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/muriloventuroso/easyssh
 	arch = x86_64
 	license = GPL3
@@ -11,7 +11,6 @@ pkgbase = easyssh
 	depends = libgranite.so
 	depends = gtk3
 	source = easyssh-1.3.4.tar.gz::https://github.com/muriloventuroso/easyssh/archive/1.3.4.tar.gz
-	source = 0001-fix-vte-build-error.patch
 	sha256sums = d59eaa43d8c633db69dd75f44ee5c5b19c8df0144adb9c87187fbaf734a76548
 	sha256sums = 1be1e1f1d654eafb31972320f1c94a17b7f35c4e938ceba8b6da122ab459cb48
 
diff --git a/0001-fix-vte-build-error.patch b/0001-fix-vte-build-error.patch
deleted file mode 100644
index 064bca5c25e5..000000000000
--- a/0001-fix-vte-build-error.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8074631b82be5d695da493059a4f7bba28ce624b Mon Sep 17 00:00:00 2001
-From: FabioLolix <fabio.lolix@gmail.com>
-Date: Mon, 17 Sep 2018 23:31:29 +0200
-Subject: [PATCH] fix-vte-build-error
-
----
- src/Widgets/TerminalBox.vala | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/Widgets/TerminalBox.vala b/src/Widgets/TerminalBox.vala
-index c4812e1..8f48f4e 100755
---- a/src/Widgets/TerminalBox.vala
-+++ b/src/Widgets/TerminalBox.vala
-@@ -86,7 +86,7 @@ namespace EasySSH {
-             }
-             var cmd = builder.str;
-             #if UBUNTU_BIONIC_PATCHED_VTE
--                term.feed_child(cmd, cmd.length);
-+                term.feed_child(cmd.to_utf8());
-             #else
-                 term.feed_child(cmd.to_utf8 ());
-             #endif
-@@ -178,7 +178,7 @@ namespace EasySSH {
-         private void term_send_password() {
-             var cmd = dataHost.password + "\n";
-             #if UBUNTU_BIONIC_PATCHED_VTE
--                term.feed_child(cmd, cmd.length);
-+                term.feed_child(cmd.to_utf8());
-             #else
-                 term.feed_child(cmd.to_utf8 ());
-             #endif
-@@ -187,7 +187,7 @@ namespace EasySSH {
-         private void term_send(string cmd) {
-             var n_cmd = cmd + "\n";
-             #if UBUNTU_BIONIC_PATCHED_VTE
--                term.feed_child(n_cmd, cmd.length);
-+                term.feed_child(n_cmd.to_utf8());
-             #else
-                 term.feed_child(n_cmd.to_utf8 ());
-             #endif
-@@ -259,4 +259,4 @@ namespace EasySSH {
- 
- 
-     }
--}
-\ No newline at end of file
-+}
--- 
-2.18.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 7b96c936a71d..eb8b993b07cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,20 @@
 
 pkgname=easyssh
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="SSH connection manager for Pantheon"
 arch=('x86_64')
 url="https://github.com/muriloventuroso/easyssh"
 license=(GPL3)
 depends=(libgranite.so gtk3)
 makedepends=(vala meson ninja)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/muriloventuroso/easyssh/archive/${pkgver}.tar.gz"
-        0001-fix-vte-build-error.patch)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/muriloventuroso/easyssh/archive/${pkgver}.tar.gz")
 sha256sums=('d59eaa43d8c633db69dd75f44ee5c5b19c8df0144adb9c87187fbaf734a76548'
             '1be1e1f1d654eafb31972320f1c94a17b7f35c4e938ceba8b6da122ab459cb48')
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ../0001-fix-vte-build-error.patch
-}
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  meson build --prefix=/usr -D libunity=false
+  meson build --prefix=/usr -D libunity=false -D ubuntu-bionic-patched-vte=false
   ninja -C build
 }