[arch-commits] Commit in nautilus-terminal/trunk (PKGBUILD vte091.patch)

[Balló György]

    Date: Thursday, January 22, 2015 @ 04:52:27
  Author: bgyorgy
Revision: 126393

upgpkg: nautilus-terminal 1.0-5

Fix compatibility with vte 2.91 (FS#43410)

Added:
  nautilus-terminal/trunk/vte091.patch
Modified:
  nautilus-terminal/trunk/PKGBUILD

--------------+
 PKGBUILD     |   12 ++++++++----
 vte091.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-22 03:35:29 UTC (rev 126392)
+++ PKGBUILD	2015-01-22 03:52:27 UTC (rev 126393)
@@ -3,24 +3,28 @@
 
 pkgname=nautilus-terminal
 pkgver=1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An integrated terminal for Nautilus"
 arch=('any')
 url="http://projects.flogisoft.com/nautilus-terminal/"
 license=('GPL')
 depends=('python2-nautilus' 'vte3' 'python2-xdg')
-source=(http://projects.flogisoft.com/$pkgname/download/${pkgname}_${pkgver}_src.tar.gz)
-md5sums=('ba89ae9a4e5c632a03da7e342679ad94')
+source=(http://projects.flogisoft.com/$pkgname/download/${pkgname}_${pkgver}_src.tar.gz
+        vte091.patch)
+md5sums=('ba89ae9a4e5c632a03da7e342679ad94'
+         '4a659e43bc9b127fbae41d18206bbf97')
 
 prepare() {
   cd "$srcdir/${pkgname}_${pkgver}_src"
 
   sed -i 's|^#!/usr/bin/python$|#!/usr/bin/python2|' src/nautilus_terminal.py
+
+  # Fix compatibility with vte 2.91
+  patch -Np0 -i ../vte091.patch
 }
 
 package() {
   cd "$srcdir/${pkgname}_${pkgver}_src"
-
   ./install.sh --package "$pkgdir"
 
   # Remove doc files

Added: vte091.patch
===================================================================
--- vte091.patch	                        (rev 0)
+++ vte091.patch	2015-01-22 03:52:27 UTC (rev 126393)
@@ -0,0 +1,22 @@
+=== modified file 'src/nautilus_terminal.py'
+--- src/nautilus_terminal.py	2011-10-17 11:59:24 +0000
++++ src/nautilus_terminal.py	2014-12-01 07:29:40 +0000
+@@ -121,7 +121,7 @@
+         #Term
+         self.shell_pid = -1
+         self.term = Vte.Terminal()
+-        self.shell_pid = self.term.fork_command_full(Vte.PtyFlags.DEFAULT,
++        self.shell_pid = self.term.spawn_sync(Vte.PtyFlags.DEFAULT,
+                 self._path, [CONF.get("terminal/shell")], None,
+                 GLib.SpawnFlags.SEARCH_PATH, None, None)[1]
+         self.term.connect_after("child-exited", self._on_term_child_exited)
+@@ -308,7 +308,7 @@
+             term -- The VTE terminal (self.term).
+         """
+         if not self._respawn_lock:
+-            self.shell_pid = self.term.fork_command_full(Vte.PtyFlags.DEFAULT,
++            self.shell_pid = self.term.spawn_sync(Vte.PtyFlags.DEFAULT,
+                 self._path, [CONF.get("terminal/shell")], None,
+                 GLib.SpawnFlags.SEARCH_PATH, None, None)[1]
+ 
+