diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 543b848c52a..f5c23615ab0 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.124 2013/09/05 08:25:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.125 2013/09/12 09:12:13 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,6 +6,7 @@ COMMENT= integrated music management application for GNOME GNOME_PROJECT= rhythmbox GNOME_VERSION= 3.0 +REVISION= 0 SHARED_LIBS += rhythmbox-core 0.0 # 7.0 diff --git a/audio/rhythmbox/patches/patch-plugins_rbzeitgeist_rbzeitgeist_py b/audio/rhythmbox/patches/patch-plugins_rbzeitgeist_rbzeitgeist_py new file mode 100644 index 00000000000..613777a529f --- /dev/null +++ b/audio/rhythmbox/patches/patch-plugins_rbzeitgeist_rbzeitgeist_py @@ -0,0 +1,54 @@ +$OpenBSD: patch-plugins_rbzeitgeist_rbzeitgeist_py,v 1.1 2013/09/12 09:12:13 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=707956 + +--- plugins/rbzeitgeist/rbzeitgeist.py.orig Tue Sep 10 15:29:31 2013 ++++ plugins/rbzeitgeist/rbzeitgeist.py Tue Sep 10 15:29:38 2013 +@@ -37,8 +37,8 @@ from zeitgeist.datamodel import Event, Subject, Interp + + try: + IFACE = ZeitgeistClient() +-except RuntimeError, e: +- print "Unable to connect to Zeitgeist, won't send events. Reason: '%s'" %e ++except RuntimeError as e: ++ print ("Unable to connect to Zeitgeist, won't send events. Reason: '%s'" %e) + IFACE = None + + class ZeitgeistPlugin(GObject.Object, Peas.Activatable): +@@ -46,12 +46,12 @@ class ZeitgeistPlugin(GObject.Object, Peas.Activatable + object = GObject.property(type=GObject.Object) + + def __init__(self): +- GObject.Object.__init__(self) ++ GObject.Object.__init__(self) + + def do_activate(self): +- print "Loading Zeitgeist plugin..." ++ print ("Loading Zeitgeist plugin...") + if IFACE is not None: +- shell = self.object ++ shell = self.object + shell_player = shell.props.shell_player + self.__psc_id = shell_player.connect("playing-song-changed", self.playing_song_changed) + +@@ -109,7 +109,7 @@ class ZeitgeistPlugin(GObject.Object, Peas.Activatable + idle, it means there are no more signals scheduled, so we + will have already received the eos if it was coming. + """ +- shell = self.object ++ shell = self.object + db = shell.props.db + GLib.idle_add(self.send_to_zeitgeist, db, entry, event_type) + +@@ -150,9 +150,9 @@ class ZeitgeistPlugin(GObject.Object, Peas.Activatable + f.query_info_async(Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_DEFAULT, None, file_info_complete, None) + + def do_deactivate(self): +- print "Deactivating Zeitgeist plugin..." ++ print ("Deactivating Zeitgeist plugin...") + if IFACE is not None: +- shell = self.object ++ shell = self.object + shell_player = shell.props.shell_player + shell_player.disconnect(self.__psc_id) + self.__psc_id = None