summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2018-04-04 16:07:32 -0400
committerChris Severance2018-04-04 16:07:32 -0400
commiteccd79aa9515e42d509bbeaaeb92b6b779d324f6 (patch)
tree89541e62a3ddab45b392c81b7f3d9f7710453354
parentb63f65a8ac02a73285b7f642ccf85db7c0ec9337 (diff)
downloadaur-eccd79aa9515e42d509bbeaaeb92b6b779d324f6.tar.gz
Update to 18.4
-rw-r--r--.SRCINFO10
-rw-r--r--0000-string-vte3-052-string-char.patch17
-rw-r--r--PKGBUILD16
3 files changed, 36 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0c0ae2ef4c2..209b502da30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Feb 6 09:30:55 UTC 2018
+# Wed Apr 4 20:06:06 UTC 2018
pkgbase = timeshift
pkgdesc = A system restore utility for Linux
- pkgver = 18.2
+ pkgver = 18.4
pkgrel = 1
url = https://github.com/teejee2008/timeshift
arch = i686
@@ -21,8 +21,10 @@ pkgbase = timeshift
depends = cron
optdepends = gksu: run timeshift from a menu
options = !emptydirs
- source = timeshift_v18.2.tgz::https://github.com/teejee2008/timeshift/archive/v18.2.tar.gz
- sha256sums = ccdcd035217b8fb7dfee20f355ac32077be47b23306226cec879b0f039525a7c
+ source = timeshift_v18.4.tgz::https://github.com/teejee2008/timeshift/archive/v18.4.tar.gz
+ source = 0000-string-vte3-052-string-char.patch
+ sha256sums = 5f180ba2ed66531b10e6cc9b1966e60be1c646ebe304dd0a29b4215318892feb
+ sha256sums = 9a6fa9a20122e275f8f13cbd35d151c8f5a76c1c2d16ae99fb676a0c06a7f420
pkgname = timeshift
diff --git a/0000-string-vte3-052-string-char.patch b/0000-string-vte3-052-string-char.patch
new file mode 100644
index 00000000000..8170471f365
--- /dev/null
+++ b/0000-string-vte3-052-string-char.patch
@@ -0,0 +1,17 @@
+--- src/Utility/Gtk/TerminalWindow.vala.orig 2018-04-01 03:46:21.000000000 -0400
++++ src/Utility/Gtk/TerminalWindow.vala 2018-04-01 13:50:13.627096219 -0400
+@@ -164,11 +164,14 @@ public class TerminalWindow : Gtk.Window
+ log_error (e.message);
+ }
+ }
+
+ public void execute_command(string command){
++/*
+ term.feed_child("%s\n".printf(command), -1);
++*/
++ term.feed_child("%s\n".printf(command).to_utf8());
+ }
+
+ public void execute_script(string script_path, bool wait = false){
+ string[] argv = new string[1];
+ argv[0] = script_path;
diff --git a/PKGBUILD b/PKGBUILD
index 1dccbb41644..54e2956e3b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ set -u
#_ubver='17.11'; _libgee='libgee>=0.18.0'
#_ubver='18.1'; _libgee='libgee>=0.18.0'
#_ubver='18.1.1'; _libgee='libgee>=0.18.0'
-_ubver='18.2'; _libgee='libgee>=0.18.0'
+_ubver='18.4'; _libgee='libgee>=0.18.0'
pkgname='timeshift'
pkgver="${_ubver}"
pkgrel='1'
@@ -41,9 +41,19 @@ _github='teejee2008'
_verwatch=("https://github.com/${_github}/${pkgname}/releases.atom" '\s\+<title>Timeshift v\([0-9\.]\+\)</title>.*' 'f')
_srcdir="${pkgname}-${pkgver}"
source=("${pkgname}_v${pkgver}.tgz::https://github.com/${_github}/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('ccdcd035217b8fb7dfee20f355ac32077be47b23306226cec879b0f039525a7c')
+source+=('0000-string-vte3-052-string-char.patch')
+sha256sums=('5f180ba2ed66531b10e6cc9b1966e60be1c646ebe304dd0a29b4215318892feb'
+ '9a6fa9a20122e275f8f13cbd35d151c8f5a76c1c2d16ae99fb676a0c06a7f420')
#sha256sums[0]='SKIP'
+prepare() {
+ set -u
+ cd "${_srcdir}"
+ # (cd ../../..; diff -pNau5 'src/Utility/Gtk/TerminalWindow.vala'{.orig,} > '0000-string-vte3-052-string-char.patch')
+ patch -Nbup0 -i "${srcdir}/0000-string-vte3-052-string-char.patch"
+ set +u
+}
+
build() {
set -u
make -C "${_srcdir}" -s -j1
@@ -52,7 +62,7 @@ build() {
package() {
set -u
- make -C "${_srcdir}" DESTDIR="${pkgdir}" install
+ make -C "${_srcdir}" -j1 DESTDIR="${pkgdir}" install
set +u
}
set +u