Merge lp:~mniess/ubuntu/trusty/totem/fix-lp1292262 into lp:ubuntu/trusty/totem

Proposed by Matthias Niess on 2014-03-23
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~mniess/ubuntu/trusty/totem/fix-lp1292262
Merge into: lp:ubuntu/trusty/totem
Diff against target: 59 lines (+39/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/94-fix-subtitle-downloader.patch (+30/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~mniess/ubuntu/trusty/totem/fix-lp1292262
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-03-23 Approve on 2014-03-31
Jackson Doak (community) Approve on 2014-03-24
Review via email: mp+212324@code.launchpad.net

Description of the change

The subtitle downloader plugin in totem does not work (LP: #1292262).
The bug has been fixed upstream. This patch incorporates the fix.

To post a comment you must log in.
32. By Matthias Niess on 2014-03-24

target trusty and add dep-3 patch header

Jackson Doak (noskcaj) wrote :

All the changes look ok, approve from me.

review: Approve
Sebastien Bacher (seb128) wrote :

Thanks for the work, I renamed the patch to start with "git-" since those fixes are upstream and it helps to know what is coming from there/can we dropped later. I've also commited to the right vcs which is lp:~ubuntu-desktop/totem/ubuntu (see Vcs-Bzr in the control file, or the apt-get source output)

review: Approve
Matthias Niess (mniess) wrote :

Thanks. I'll make sure to look at that next time!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-02-20 11:40:43 +0000
3+++ debian/changelog 2014-03-24 21:10:55 +0000
4@@ -1,3 +1,11 @@
5+totem (3.10.1-1ubuntu4) trusty; urgency=medium
6+
7+ * debian/patches/94-fix-subtitle-downloader.patch:
8+ - missing dependency in opensubtitles.py and bad argument passed
9+ to PyGObject (LP: #1292262)
10+
11+ -- Matthias Niess <mniess@gmail.com> Sun, 23 Mar 2014 17:06:05 +0100
12+
13 totem (3.10.1-1ubuntu3) trusty; urgency=medium
14
15 * Include the version of libgstreamer1.0-0 in apport reports. Thanks,
16
17=== added file 'debian/patches/94-fix-subtitle-downloader.patch'
18--- debian/patches/94-fix-subtitle-downloader.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/94-fix-subtitle-downloader.patch 2014-03-24 21:10:55 +0000
20@@ -0,0 +1,30 @@
21+Description: adds a missing library import and circumvents an
22+ incompatibility between totem 3.10 and pygobject 3.11
23+Author: Matthias Niess
24+Origin: vendor
25+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=724093
26+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1292262
27+Forwarded: not-needed
28+
29+Index: fix-lp1292262/src/plugins/opensubtitles/opensubtitles.py
30+===================================================================
31+--- fix-lp1292262.orig/src/plugins/opensubtitles/opensubtitles.py 2014-03-23 17:02:37.229660000 +0100
32++++ fix-lp1292262/src/plugins/opensubtitles/opensubtitles.py 2014-03-23 17:05:57.629681060 +0100
33+@@ -1,7 +1,7 @@
34+ # -*- coding: utf-8 -*-
35+
36+ from gi.repository import GObject, Peas, Gtk, Gdk # pylint: disable-msg=E0611
37+-from gi.repository import Gio, Pango, Totem # pylint: disable-msg=E0611
38++from gi.repository import GLib, Gio, Pango, Totem # pylint: disable-msg=E0611
39+
40+ import xmlrpclib
41+ import threading
42+@@ -438,7 +438,7 @@
43+ builder = Totem.plugin_load_interface ("opensubtitles",
44+ "opensubtitles.ui", True,
45+ self._totem.get_main_window (),
46+- self)
47++ None)
48+
49+ # Obtain all the widgets we need to initialize
50+ combobox = builder.get_object ('language_combobox')
51
52=== modified file 'debian/patches/series'
53--- debian/patches/series 2013-12-23 18:34:50 +0000
54+++ debian/patches/series 2014-03-24 21:10:55 +0000
55@@ -3,3 +3,4 @@
56 92_gst-plugins-good.patch
57 93_grilo_optional.patch
58 revert_shell_menu.patch
59+94-fix-subtitle-downloader.patch

Subscribers

People subscribed via source and target branches