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

Proposed by Matthias Niess
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 Approve
Jackson Doak (community) Approve
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

target trusty and add dep-3 patch header

Revision history for this message
Jackson Doak (noskcaj) wrote :

All the changes look ok, approve from me.

review: Approve
Revision history for this message
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
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-20 11:40:43 +0000
+++ debian/changelog 2014-03-24 21:10:55 +0000
@@ -1,3 +1,11 @@
1totem (3.10.1-1ubuntu4) trusty; urgency=medium
2
3 * debian/patches/94-fix-subtitle-downloader.patch:
4 - missing dependency in opensubtitles.py and bad argument passed
5 to PyGObject (LP: #1292262)
6
7 -- Matthias Niess <mniess@gmail.com> Sun, 23 Mar 2014 17:06:05 +0100
8
1totem (3.10.1-1ubuntu3) trusty; urgency=medium9totem (3.10.1-1ubuntu3) trusty; urgency=medium
210
3 * Include the version of libgstreamer1.0-0 in apport reports. Thanks,11 * Include the version of libgstreamer1.0-0 in apport reports. Thanks,
412
=== added file 'debian/patches/94-fix-subtitle-downloader.patch'
--- debian/patches/94-fix-subtitle-downloader.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/94-fix-subtitle-downloader.patch 2014-03-24 21:10:55 +0000
@@ -0,0 +1,30 @@
1Description: adds a missing library import and circumvents an
2 incompatibility between totem 3.10 and pygobject 3.11
3Author: Matthias Niess
4Origin: vendor
5Bug: https://bugzilla.gnome.org/show_bug.cgi?id=724093
6Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1292262
7Forwarded: not-needed
8
9Index: fix-lp1292262/src/plugins/opensubtitles/opensubtitles.py
10===================================================================
11--- fix-lp1292262.orig/src/plugins/opensubtitles/opensubtitles.py 2014-03-23 17:02:37.229660000 +0100
12+++ fix-lp1292262/src/plugins/opensubtitles/opensubtitles.py 2014-03-23 17:05:57.629681060 +0100
13@@ -1,7 +1,7 @@
14 # -*- coding: utf-8 -*-
15
16 from gi.repository import GObject, Peas, Gtk, Gdk # pylint: disable-msg=E0611
17-from gi.repository import Gio, Pango, Totem # pylint: disable-msg=E0611
18+from gi.repository import GLib, Gio, Pango, Totem # pylint: disable-msg=E0611
19
20 import xmlrpclib
21 import threading
22@@ -438,7 +438,7 @@
23 builder = Totem.plugin_load_interface ("opensubtitles",
24 "opensubtitles.ui", True,
25 self._totem.get_main_window (),
26- self)
27+ None)
28
29 # Obtain all the widgets we need to initialize
30 combobox = builder.get_object ('language_combobox')
031
=== modified file 'debian/patches/series'
--- debian/patches/series 2013-12-23 18:34:50 +0000
+++ debian/patches/series 2014-03-24 21:10:55 +0000
@@ -3,3 +3,4 @@
392_gst-plugins-good.patch392_gst-plugins-good.patch
493_grilo_optional.patch493_grilo_optional.patch
5revert_shell_menu.patch5revert_shell_menu.patch
694-fix-subtitle-downloader.patch

Subscribers

People subscribed via source and target branches