diff options
author | FabioLolix | 2018-09-25 00:24:19 +0200 |
---|---|---|
committer | FabioLolix | 2018-09-25 00:24:19 +0200 |
commit | 1598ea4e0928f593193ba8d721fa56c13ceac67a (patch) | |
tree | a3fdeda6fecec03ddd7b300132df4944e36f8e0c | |
parent | ce661a0517bb70bf6d1071b5128f92a3c11af012 (diff) | |
download | aur-1598ea4e0928f593193ba8d721fa56c13ceac67a.tar.gz |
Improve build
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0001-fix-vte-build-error.patch | 50 | ||||
-rw-r--r-- | PKGBUILD | 14 |
3 files changed, 5 insertions, 63 deletions
@@ -1,7 +1,7 @@ pkgbase = easyssh-git pkgdesc = SSH connection manager for Pantheon pkgver = 1.3.4.r5.g75b6765 - pkgrel = 1 + pkgrel = 2 url = https://github.com/muriloventuroso/easyssh arch = x86_64 license = GPL3 @@ -14,9 +14,7 @@ pkgbase = easyssh-git provides = easyssh conflicts = easyssh source = easyssh-git::git+https://github.com/muriloventuroso/easyssh.git - source = 0001-fix-vte-build-error.patch sha256sums = SKIP - sha256sums = 1be1e1f1d654eafb31972320f1c94a17b7f35c4e938ceba8b6da122ab459cb48 pkgname = easyssh-git 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 - @@ -2,7 +2,7 @@ pkgname=easyssh-git pkgver=1.3.4.r5.g75b6765 -pkgrel=1 +pkgrel=2 pkgdesc="SSH connection manager for Pantheon" arch=(x86_64) url="https://github.com/muriloventuroso/easyssh" @@ -11,23 +11,17 @@ depends=(libgranite.so gtk3) makedepends=(vala meson ninja git) provides=(easyssh) conflicts=(easyssh) -source=("${pkgname}::git+${url}.git" 0001-fix-vte-build-error.patch) -sha256sums=('SKIP' - '1be1e1f1d654eafb31972320f1c94a17b7f35c4e938ceba8b6da122ab459cb48') +source=("${pkgname}::git+${url}.git") +sha256sums=('SKIP') pkgver() { cd "${pkgname}" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -prepare() { - cd "${pkgname}" - patch -p1 -i ../0001-fix-vte-build-error.patch -} - build() { cd "${pkgname}" - meson build --prefix=/usr -D libunity=false + meson build --prefix=/usr -D libunity=false -D ubuntu-bionic-patched-vte=false ninja -C build } |