Hello community, here is the log from the commit of package nautilus-terminal for openSUSE:Factory checked in at 2014-10-15 08:51:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nautilus-terminal (Old) and /work/SRC/openSUSE:Factory/.nautilus-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus-terminal" Changes: -------- --- /work/SRC/openSUSE:Factory/nautilus-terminal/nautilus-terminal.changes 2013-03-05 06:45:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nautilus-terminal.new/nautilus-terminal.changes 2014-10-15 08:51:52.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Oct 12 22:07:29 UTC 2014 - [email protected] + +- Add nautilus-terminal-vte2.91.patch: Fix usage with Vte 2.91. +- Add vte-devel BuildRequires: needed in order to be able to detect + if we need to apply the patch during build. If vte-2.91.pc exist, + we apply the patch and make the resulting package depend on + Vte 2.91. + +------------------------------------------------------------------- New: ---- nautilus-terminal-vte2.91.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-terminal.spec ++++++ --- /var/tmp/diff_new_pack.MXf3xE/_old 2014-10-15 08:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.MXf3xE/_new 2014-10-15 08:51:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nautilus-terminal # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,9 +26,12 @@ Group: System/GUI/GNOME Url: http://software.flogisoft.com/nautilus-terminal/ Source: %{name}_%{version}_src.tar.gz +# PATCH-FIX-UPSTREAM nautilus-terminal-vte2.91.patch [email protected] -- Fix usage with Vte 2.91. +Patch0: nautilus-terminal-vte2.91.patch # For directory ownership: BuildRequires: gobject-introspection BuildRequires: python-nautilus +BuildRequires: vte-devel Requires: nautilus %if %{have_lang} Recommends: %{name}-lang @@ -46,6 +49,10 @@ %prep %setup -q -n %{name}_%{version}_src +if pkg-config --exists vte-2.91; then +# patch0 only applies when built against Vte 2.91 +%patch0 -p1 +fi sed -i ' s:/usr/share/doc:%{_docdir}/%{name}: s:/usr/share:%{_datadir}: ++++++ nautilus-terminal-vte2.91.patch ++++++ Index: nautilus-terminal_1.0_src/src/nautilus_terminal.py =================================================================== --- nautilus-terminal_1.0_src.orig/src/nautilus_terminal.py +++ nautilus-terminal_1.0_src/src/nautilus_terminal.py @@ -46,6 +46,8 @@ else: from urllib.request import url2pathname from configparser import RawConfigParser +import gi +gi.require_version('Vte', '2.91') from gi.repository import GObject, Nautilus, Gtk, Gdk, Vte, GLib @@ -121,7 +123,7 @@ class NautilusTerminal(object): #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) @@ -301,14 +303,14 @@ class NautilusTerminal(object): return self.menu.popup(None, None, None, None, 3, 0) - def _on_term_child_exited(self, term): + def _on_term_child_exited(self, term, status): """Called when the shell is terminated. Args: 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] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
