v18.6 with patch

3 files changed, 48 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b952270a2b6a..c7c05af32596 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = polo
 	pkgdesc = A modern, light-weight GTK file manager for Linux, currently in beta
-	pkgver = 18.3
+	pkgver = 18.6
 	pkgrel = 1
-	url = http://www.teejeetech.in/
+	url = https://teejee2008.github.io/polo/
 	arch = i686
 	arch = x86_64
 	license = GPL2
@@ -27,8 +27,10 @@ pkgbase = polo
 	provides = polo
 	conflicts = polo
 	conflicts = polo-bin
-	source = https://github.com/teejee2008/polo/archive/v18.3-beta.tar.gz
-	md5sums = 68a0d95d1ff3b3b7b267d3fe04f15618
+	source = https://github.com/teejee2008/polo/archive/v18.6-beta.tar.gz
+	source = 0001-Fixed-build-with-recent-vala-version.patch
+	sha256sums = 38ce401f607af3e77b3cd099efc6aea73410361d35771be3563b0f99f147a352
+	sha256sums = 97d78f7879eb913dc4b9574e6854553e956f5a883beef2335887d1d12061d0b2
 
 pkgname = polo
 
diff --git a/0001-Fixed-build-with-recent-vala-version.patch b/0001-Fixed-build-with-recent-vala-version.patch
new file mode 100644
index 000000000000..63a19ac24b48
--- /dev/null
+++ b/0001-Fixed-build-with-recent-vala-version.patch
@@ -0,0 +1,25 @@
+From 9ab01270ce389780e3eecb84935c003440befc5a Mon Sep 17 00:00:00 2001
+From: FabioLolix <fabio.lolix@gmail.com>
+Date: Sat, 16 Jun 2018 09:49:13 +0200
+Subject: [PATCH] Fixed build with recent vala version
+
+---
+ src/Gtk/TermBox.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Gtk/TermBox.vala b/src/Gtk/TermBox.vala
+index a3ed31a..af5d4d1 100644
+--- a/src/Gtk/TermBox.vala
++++ b/src/Gtk/TermBox.vala
+@@ -249,7 +249,7 @@ public class TermBox : Gtk.Box {
+ 			cmd = "%s\n".printf(cmd);
+ 		}
+ 		
+-		term.feed_child(cmd, -1);
++		term.feed_child(cmd.to_utf8());
+ 	}
+ 
+ 	public void refresh(){
+-- 
+2.17.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 9070133cfc1f..7fa90b4fccb8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 
 pkgname=polo
 pkgrel=1
-pkgver=18.3
+pkgver=18.6
 _channel=beta
 pkgdesc="A modern, light-weight GTK file manager for Linux,  currently in beta"
 arch=('i686' 'x86_64')
-url="http://www.teejeetech.in/"
+url="https://teejee2008.github.io/polo/"
 license=('GPL2')
 depends=('gtk3' 'libgee' 'libsoup' 'vte3' 'rsync' 'gvfs' 'p7zip')
 makedepends=('vala' 'chrpath')
@@ -21,19 +21,26 @@ optdepends=('mediainfo: read media properties from audio and video files'
             'polo-donation-plugins')
 provides=('polo')
 conflicts=('polo' 'polo-bin')
-source=(https://github.com/teejee2008/polo/archive/v${pkgver}-${_channel}.tar.gz)
-md5sums=('68a0d95d1ff3b3b7b267d3fe04f15618')
+source=("https://github.com/teejee2008/polo/archive/v${pkgver}-${_channel}.tar.gz"
+        '0001-Fixed-build-with-recent-vala-version.patch')
+sha256sums=('38ce401f607af3e77b3cd099efc6aea73410361d35771be3563b0f99f147a352'
+            '97d78f7879eb913dc4b9574e6854553e956f5a883beef2335887d1d12061d0b2')
+
+prepare() {
+  cd "$srcdir/${pkgname}-${pkgver}-${_channel}"
+  patch -Np1 -i ../0001-Fixed-build-with-recent-vala-version.patch
+}
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver}-${_channel}
+  cd "$srcdir/${pkgname}-${pkgver}-${_channel}"
   make
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver}-${_channel}
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/${pkgname}-${pkgver}-${_channel}"
+  make DESTDIR="${pkgdir}" install
 
-  chrpath --delete ${pkgdir}/usr/bin/polo-gtk
-  ln -s /usr/bin/polo-gtk $pkgdir/usr/bin/polo
-  rm $pkgdir/usr/bin/polo-uninstall
+  chrpath --delete "${pkgdir}"/usr/bin/polo-gtk
+  ln -s /usr/bin/polo-gtk "${pkgdir}"/usr/bin/polo
+  rm "${pkgdir}"/usr/bin/polo-uninstall
 }