r26464 - in /packages/unstable/ontv/debian: changelog patches/02_vte_reaper.patch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Thu Feb 3 01:09:24 UTC 2011
Author: pochu
Date: Thu Feb 3 01:09:19 2011
New Revision: 26464
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26464
Log:
* debian/patches/02_vte_reaper.patch:
- From upstream git, stop using Vte.Reaper. It was an API added
in the Debian package, and I removed it since upstream said they
weren't going to add that upstream. Closes: #611810.
Added:
packages/unstable/ontv/debian/patches/02_vte_reaper.patch
Modified:
packages/unstable/ontv/debian/changelog
Modified: packages/unstable/ontv/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/changelog?rev=26464&op=diff
==============================================================================
--- packages/unstable/ontv/debian/changelog [utf-8] (original)
+++ packages/unstable/ontv/debian/changelog [utf-8] Thu Feb 3 01:09:19 2011
@@ -1,3 +1,12 @@
+ontv (3.0.0-5) unstable; urgency=high
+
+ * debian/patches/02_vte_reaper.patch:
+ - From upstream git, stop using Vte.Reaper. It was an API added
+ in the Debian package, and I removed it since upstream said they
+ weren't going to add that upstream. Closes: #611810.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 03 Feb 2011 01:05:34 +0000
+
ontv (3.0.0-4) unstable; urgency=low
* debian/rules:
Added: packages/unstable/ontv/debian/patches/02_vte_reaper.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/ontv/debian/patches/02_vte_reaper.patch?rev=26464&op=file
==============================================================================
--- packages/unstable/ontv/debian/patches/02_vte_reaper.patch (added)
+++ packages/unstable/ontv/debian/patches/02_vte_reaper.patch [utf-8] Thu Feb 3 01:09:19 2011
@@ -1,0 +1,98 @@
+From aaec9feb06f30b7a1f049f16010305281ca662b2 Mon Sep 17 00:00:00 2001
+From: Olof Kindgren <olki at src.gnome.org>
+Date: Wed, 02 Feb 2011 22:04:55 +0000
+Subject: Stop using deprecated reaper object
+
+The reaper object is deprecated and has been removed in recent python vte
+bindings. Use get_child_exit_status() instead. Fixes bgo#636354
+---
+diff --git a/ontv/XMLTVAssistant.py b/ontv/XMLTVAssistant.py
+index 8c8a519..5b12406 100644
+--- a/ontv/XMLTVAssistant.py
++++ b/ontv/XMLTVAssistant.py
+@@ -328,9 +328,8 @@ class XMLTVAssistant(gtk.Assistant):
+ page = self.get_nth_page(page_number)
+
+ if self.__previous_page == page_number + 1:
+- reaper = vte.reaper_get()
+- if reaper.handler_is_connected(self.id):
+- reaper.disconnect(self.id)
++ if self.terminal.handler_is_connected(self.id):
++ self.terminal.disconnect(self.id)
+
+ if page_number == 1:
+ if self.installed_button.get_active() and self.country:
+@@ -349,8 +348,7 @@ class XMLTVAssistant(gtk.Assistant):
+ self.__setup_terminal()
+
+ self.terminal.reset(full=True, clear_history=True)
+- reaper = vte.reaper_get()
+- self.id = reaper.connect("child-exited", self.__terminal_exited,
++ self.id = self.terminal.connect("child-exited", self.__terminal_exited,
+ page)
+ grabber = self.grabber_command.split()[0]
+ configure_command = [grabber, "--configure", "--quiet"]
+@@ -374,8 +372,7 @@ class XMLTVAssistant(gtk.Assistant):
+ self.terminal.reset(full=True, clear_history=True)
+ id = gobject.timeout_add(250, self.__pulse_progressbar,
+ self.progressbar)
+- reaper = vte.reaper_get()
+- self.id = reaper.connect("child-exited",
++ self.id = self.terminal.connect("child-exited",
+ self.__grabber_command_exited,
+ (self.progressbar, id, page))
+
+@@ -410,20 +407,21 @@ class XMLTVAssistant(gtk.Assistant):
+ return grabber_command
+
+
+- def __terminal_exited(self, reaper, pid, status, page):
+- if reaper.handler_is_connected(self.id):
+- reaper.disconnect(self.id)
++ def __terminal_exited(self, term, page):
++ if term.handler_is_connected(self.id):
++ term.disconnect(self.id)
+ self.set_page_complete(page, True)
+
+ def __pulse_progressbar(self, progressbar):
+ progressbar.pulse()
+ return True
+
+- def __grabber_command_exited(self, reaper, pid, status, (progressbar, id,
++ def __grabber_command_exited(self, term, (progressbar, id,
+ page)):
+- if reaper.handler_is_connected(self.id):
+- reaper.disconnect(self.id)
++ if term.handler_is_connected(self.id):
++ term.disconnect(self.id)
+
++ status = term.get_child_exit_status()
+ if os.WEXITSTATUS(status) != 0:
+ gobject.source_remove(id)
+ progressbar.modify_fg(gtk.STATE_NORMAL,
+@@ -441,8 +439,7 @@ class XMLTVAssistant(gtk.Assistant):
+ arguments = self.grabber_command.split()
+ sort_command = "tv_sort %s --output %s" % (self.xmltvfile_path,
+ self.xmltvfile_path)
+- reaper = vte.reaper_get()
+- self.id = reaper.connect("child-exited",
++ self.id = self.terminal.connect("child-exited",
+ self.__sort_command_exited,
+ (self.progressbar, id, page))
+ pid = self.terminal.fork_command(sort_command.split()[0],
+@@ -451,10 +448,10 @@ class XMLTVAssistant(gtk.Assistant):
+ else:
+ self.__set_page_4_done(progressbar, id, page)
+
+- def __sort_command_exited(self, reaper, pid, status, (progressbar, id,
++ def __sort_command_exited(self, term, (progressbar, id,
+ page)):
+- if reaper.handler_is_connected(self.id):
+- reaper.disconnect(self.id)
++ if term.handler_is_connected(self.id):
++ term.disconnect(self.id)
+
+ self.xmltvfile.props.path = self.xmltvfile_path
+ self.xmltvfile.load()
+--
+cgit v0.8.3.1
More information about the pkg-gnome-commits
mailing list