From aa3dc42922a49a7f2fcaebe0e8b2d9f7b4b81d43 Mon Sep 17 00:00:00 2001 From: crvi Date: Apr 12 2021 14:26:15 +0000 Subject: + rhythmbox-3.4.4-9 - Reinstate zeitgeist plugin (#1876403) - Update plugin website links (#1856177) - Fix ctrl+q shortcut not working with caps lock on - Fix 'rhythmbox-client --quit' not always working - Fix missing app icon in about dialog - Fix lyrics plugin not loading lyrics --- diff --git a/rhythmbox-3.4.4-about-dialog-missing-icon.patch b/rhythmbox-3.4.4-about-dialog-missing-icon.patch new file mode 100644 index 0000000..1c110fb --- /dev/null +++ b/rhythmbox-3.4.4-about-dialog-missing-icon.patch @@ -0,0 +1,28 @@ +From 0554e3da820a5a238aca4eee7e0684e727356b7e Mon Sep 17 00:00:00 2001 +From: Andre Klapper +Date: Mon, 6 Jan 2020 14:14:40 +0100 +Subject: [PATCH] Fix broken application icon in "About" dialog + +Regression from 17c46812c32b2ff95e3839229db3774a23e2cb47 + +Fixes #1749 +--- + shell/rb-application.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell/rb-application.c b/shell/rb-application.c +index bb10b7b34..37afb36fb 100644 +--- a/shell/rb-application.c ++++ b/shell/rb-application.c +@@ -205,7 +205,7 @@ about_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_data + "authors", (const char **) authors, + "documenters", (const char **) documenters, + "translator-credits", strcmp (translator_credits, "translator-credits") != 0 ? translator_credits : NULL, +- "logo-icon-name", "rhythmbox", ++ "logo-icon-name", "org.gnome.Rhythmbox", + NULL); + g_string_free (comment, TRUE); + g_free (license_trans); +-- +GitLab + diff --git a/rhythmbox-3.4.4-lyrics-not-loading.patch b/rhythmbox-3.4.4-lyrics-not-loading.patch new file mode 100644 index 0000000..bea34ce --- /dev/null +++ b/rhythmbox-3.4.4-lyrics-not-loading.patch @@ -0,0 +1,35 @@ +From a25dc62723c2119047d769238e44defe1bc63429 Mon Sep 17 00:00:00 2001 +From: crvi +Date: Wed, 23 Sep 2020 00:09:00 +0530 +Subject: [PATCH] lyrics: disable winampcn parser as its servers aren't talking + +Fixes: #1829 +--- + plugins/lyrics/LyricsSites.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/lyrics/LyricsSites.py b/plugins/lyrics/LyricsSites.py +index d68021978..ab24e188b 100644 +--- a/plugins/lyrics/LyricsSites.py ++++ b/plugins/lyrics/LyricsSites.py +@@ -26,7 +26,7 @@ + + + #from AstrawebParser import AstrawebParser +-from WinampcnParser import WinampcnParser ++#from WinampcnParser import WinampcnParser + from TerraParser import TerraParser + from DarkLyricsParser import DarkLyricsParser + from JlyricParser import JlyricParser +@@ -39,7 +39,7 @@ gettext.install('rhythmbox', RB.locale_dir()) + + lyrics_sites = [ + #{ 'id': 'astraweb.com', 'class': AstrawebParser, 'name': _("Astraweb (www.astraweb.com)") }, +- { 'id': 'winampcn.com', 'class': WinampcnParser, 'name': _("WinampCN (www.winampcn.com)") }, ++ #{ 'id': 'winampcn.com', 'class': WinampcnParser, 'name': _("WinampCN (www.winampcn.com)") }, + { 'id': 'terra.com.br', 'class': TerraParser, 'name': _("TerraBrasil (terra.com.br)") }, + { 'id': 'darklyrics.com', 'class': DarkLyricsParser, 'name': _("Dark Lyrics (darklyrics.com)") }, + { 'id': 'j-lyric.net', 'class': JlyricParser, 'name': _("Jlyric (j-lyric.net)") }, +-- +GitLab + diff --git a/rhythmbox-3.4.4-quit-flush-dbus.patch b/rhythmbox-3.4.4-quit-flush-dbus.patch new file mode 100644 index 0000000..3ff0725 --- /dev/null +++ b/rhythmbox-3.4.4-quit-flush-dbus.patch @@ -0,0 +1,30 @@ +From 47e4658d61c986ef8f1601a046a55736cd25b20a Mon Sep 17 00:00:00 2001 +From: crvi +Date: Tue, 5 Jan 2021 20:47:54 +0530 +Subject: [PATCH] rhythmbox-client: flush dbus connection to send the 'quit' + message before process exit + +This was an issue in single core / uniprocessor / VMs, where +rhythmbox-client process exits due to 'exit()' call, before the 'quit' +message is sent to the rhythmbox instance. + +Also refer: https://gitlab.gnome.org/GNOME/glib/-/issues/2284 +--- + remote/dbus/rb-client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c +index 338b26d15..fe57eef82 100644 +--- a/remote/dbus/rb-client.c ++++ b/remote/dbus/rb-client.c +@@ -1165,6 +1165,7 @@ main (int argc, char **argv) + if (quit) { + rb_debug ("quitting existing instance"); + g_action_group_activate_action (G_ACTION_GROUP (app), "quit", NULL); ++ g_dbus_connection_flush_sync (bus, NULL, NULL); + exit (0); + } + +-- +GitLab + diff --git a/rhythmbox-3.4.4-quit-with-key-modifiers.patch b/rhythmbox-3.4.4-quit-with-key-modifiers.patch new file mode 100644 index 0000000..bbe3a1d --- /dev/null +++ b/rhythmbox-3.4.4-quit-with-key-modifiers.patch @@ -0,0 +1,42 @@ +From f19be5337f7f9eeff996c20bc1f9fd8291054c25 Mon Sep 17 00:00:00 2001 +From: crvi +Date: Thu, 18 Feb 2021 06:25:04 +0530 +Subject: [PATCH] application: make keyboard shortcuts work when lock modifiers + are set + +Ignore key modifiers which are valid, but not significant as keyboard +accelerators for a GTK application. This would include num lock, caps +lock etc. This should fix issues of rhythmbox shortcuts not working +sometimes. +--- + shell/rb-application.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/shell/rb-application.c b/shell/rb-application.c +index 8492bb03b..5feaa3781 100644 +--- a/shell/rb-application.c ++++ b/shell/rb-application.c +@@ -901,13 +901,18 @@ rb_application_activate_key (RBApplication *app, GdkEventKey *event) + GList *l; + GtkWidget *window; + gboolean ret = FALSE; ++ guint event_keyval; ++ GdkModifierType event_mods; + + g_object_get (app->priv->shell, "window", &window, NULL); + ++ event_keyval = gdk_keyval_to_lower (event->keyval); ++ event_mods = (gtk_accelerator_get_default_mod_mask () & event->state); ++ + for (l = app->priv->accelerators; l != NULL; l = l->next) { + RBApplicationAccel *accel = l->data; +- if (accel->keyval == event->keyval && +- accel->mods == event->state) { ++ if (accel->keyval == event_keyval && ++ accel->mods == event_mods) { + GActionGroup *group; + + group = gtk_widget_get_action_group (window, accel->prefix); +-- +GitLab + diff --git a/rhythmbox-3.4.4-update-website-links.patch b/rhythmbox-3.4.4-update-website-links.patch new file mode 100644 index 0000000..548c191 --- /dev/null +++ b/rhythmbox-3.4.4-update-website-links.patch @@ -0,0 +1,332 @@ +From 64c07859c936df1bc739f21b87f7a56e6f8dd161 Mon Sep 17 00:00:00 2001 +From: crvi +Date: Mon, 3 Feb 2020 21:12:41 +0530 +Subject: [PATCH] plugins: Update website links + +Replace www.rhythmbox.org with updated wiki.gnome.org links + +Fixes #1751 +--- + plugins/android/android.plugin.in | 2 +- + plugins/artsearch/artsearch.plugin.in | 2 +- + plugins/audiocd/audiocd.plugin.in | 2 +- + plugins/audioscrobbler/audioscrobbler.plugin.in | 2 +- + plugins/brasero-disc-recorder/cd-recorder.plugin.in | 2 +- + plugins/context/context.plugin.in | 2 +- + plugins/daap/daap.plugin.in | 2 +- + plugins/dbus-media-server/dbus-media-server.plugin.in | 2 +- + plugins/fmradio/fmradio.plugin.in | 2 +- + plugins/generic-player/generic-player.plugin.in | 2 +- + plugins/grilo/grilo.plugin.in | 2 +- + plugins/ipod/ipod.plugin.in | 2 +- + plugins/iradio/iradio.plugin.in | 2 +- + plugins/lirc/rblirc.plugin.in | 2 +- + plugins/lyrics/lyrics.plugin.in | 2 +- + plugins/magnatune/magnatune.plugin.in | 2 +- + plugins/mmkeys/mmkeys.plugin.in | 2 +- + plugins/mpris/mpris.plugin.in | 2 +- + plugins/mtpdevice/mtpdevice.plugin.in | 2 +- + plugins/notification/notification.plugin.in | 2 +- + plugins/power-manager/power-manager.plugin.in | 2 +- + plugins/pythonconsole/pythonconsole.plugin.in | 2 +- + plugins/rbzeitgeist/rbzeitgeist.plugin.in | 2 +- + plugins/replaygain/replaygain.plugin.in | 2 +- + plugins/soundcloud/soundcloud.plugin.in | 2 +- + plugins/webremote/webremote.plugin.in | 2 +- + 26 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/plugins/android/android.plugin.in b/plugins/android/android.plugin.in +index 5f7ed6244..353c4e2d9 100644 +--- a/plugins/android/android.plugin.in ++++ b/plugins/android/android.plugin.in +@@ -6,7 +6,7 @@ _Name=Android devices + _Description=Support for Android 4.0+ devices (via MTP) + Authors=Jonathan Matthew + Copyright=Copyright © 2015 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/artsearch/artsearch.plugin.in b/plugins/artsearch/artsearch.plugin.in +index 5ecac89e2..5f4929d15 100644 +--- a/plugins/artsearch/artsearch.plugin.in ++++ b/plugins/artsearch/artsearch.plugin.in +@@ -7,7 +7,7 @@ _Name=Cover art search + _Description=Fetch album covers from the Internet + Authors=Jonathan Matthew + Copyright=Copyright © 2011 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/audiocd/audiocd.plugin.in b/plugins/audiocd/audiocd.plugin.in +index ad334ba2c..6db8239a8 100644 +--- a/plugins/audiocd/audiocd.plugin.in ++++ b/plugins/audiocd/audiocd.plugin.in +@@ -6,4 +6,4 @@ _Name=Audio CD Player + _Description=Support for playing of audio CDs as music source + Authors=James Livingston, Jonathan Matthew + Copyright=Copyright © 2005-2006 James Livingston, Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/audioscrobbler/audioscrobbler.plugin.in b/plugins/audioscrobbler/audioscrobbler.plugin.in +index 5772a3eba..c802c7c3c 100644 +--- a/plugins/audioscrobbler/audioscrobbler.plugin.in ++++ b/plugins/audioscrobbler/audioscrobbler.plugin.in +@@ -5,7 +5,7 @@ _Name=Last.fm + _Description=Submits song information to Last.fm and plays Last.fm radio streams + Authors=Alex Revo ;Ruben Vermeersch + Copyright=Copyright © 2005-2006 Alex Revo, Ruben Vermeersch +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/brasero-disc-recorder/cd-recorder.plugin.in b/plugins/brasero-disc-recorder/cd-recorder.plugin.in +index 7793bdc3a..e8b06f592 100644 +--- a/plugins/brasero-disc-recorder/cd-recorder.plugin.in ++++ b/plugins/brasero-disc-recorder/cd-recorder.plugin.in +@@ -5,7 +5,7 @@ _Name=Audio CD Recorder + _Description=Record audio CDs from playlists and duplicate audio CDs + Authors=William Jon McCann, Rouquier Philippe + Copyright=Copyright © 2006 William Jon McCann, © 2008-2009 Rouquier Philippe +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/context/context.plugin.in b/plugins/context/context.plugin.in +index 0098be456..86271e0d6 100644 +--- a/plugins/context/context.plugin.in ++++ b/plugins/context/context.plugin.in +@@ -7,4 +7,4 @@ _Name=Context Pane + _Description=Show information related to the currently playing artist and song. + Authors=John Iacona + Copyright=Copyright © 2009 John Iacona +-Website=http://rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/daap/daap.plugin.in b/plugins/daap/daap.plugin.in +index 93e16fd62..fbd5384cb 100644 +--- a/plugins/daap/daap.plugin.in ++++ b/plugins/daap/daap.plugin.in +@@ -5,7 +5,7 @@ _Name=DAAP Music Sharing + _Description=Share music and play shared music on your local network + Authors=Charles Schmidt , the Rhythmbox Developers + Copyright=Copyright © 2005-2006 Charles Schmidt, the Rhythmbox Developers +-Website=http://www.rhythmbox.org ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/dbus-media-server/dbus-media-server.plugin.in b/plugins/dbus-media-server/dbus-media-server.plugin.in +index 14f96d8b4..893070807 100644 +--- a/plugins/dbus-media-server/dbus-media-server.plugin.in ++++ b/plugins/dbus-media-server/dbus-media-server.plugin.in +@@ -5,7 +5,7 @@ _Name=MediaServer2 D-Bus interface + _Description=Provides an implementation of the MediaServer2 D-Bus interface specification + Authors=Jonathan Matthew + Copyright=Copyright © 2010 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/fmradio/fmradio.plugin.in b/plugins/fmradio/fmradio.plugin.in +index b0a70aba8..2c1d9ba20 100644 +--- a/plugins/fmradio/fmradio.plugin.in ++++ b/plugins/fmradio/fmradio.plugin.in +@@ -5,4 +5,4 @@ _Name=FM Radio + _Description=Support for FM radio broadcasting services + Authors=James Henstridge + Copyright=Copyright © 2007 James Henstridge +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/generic-player/generic-player.plugin.in b/plugins/generic-player/generic-player.plugin.in +index 2523045b2..927b45e49 100644 +--- a/plugins/generic-player/generic-player.plugin.in ++++ b/plugins/generic-player/generic-player.plugin.in +@@ -6,4 +6,4 @@ _Name=Portable Players + _Description=Support for generic audio player devices (plus PSP and Nokia 770) + Authors=James Livingston, Jonathan Matthew + Copyright=Copyright © 2005-2006 James Livingston, Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/grilo/grilo.plugin.in b/plugins/grilo/grilo.plugin.in +index 38df8ddc5..20b8af0da 100644 +--- a/plugins/grilo/grilo.plugin.in ++++ b/plugins/grilo/grilo.plugin.in +@@ -5,4 +5,4 @@ _Name=Grilo media browser + _Description=Browse various local and Internet media sources + Authors=Jonathan Matthew + Copyright=Copyright © 2011 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/ipod/ipod.plugin.in b/plugins/ipod/ipod.plugin.in +index a9c8902e5..b6a27ca84 100644 +--- a/plugins/ipod/ipod.plugin.in ++++ b/plugins/ipod/ipod.plugin.in +@@ -5,7 +5,7 @@ _Name=Portable Players - iPod + _Description=Support for Apple iPod devices (show the content, play from device) + Authors=James Livingston, Christophe Fergeau + Copyright=Copyright © 2006 James Livingston +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/iradio/iradio.plugin.in b/plugins/iradio/iradio.plugin.in +index 19013c3a1..48461dce2 100644 +--- a/plugins/iradio/iradio.plugin.in ++++ b/plugins/iradio/iradio.plugin.in +@@ -6,4 +6,4 @@ _Name=Internet Radio + _Description=Support for broadcasting services transmitted via the Internet + Authors=Rhythmbox authors + Copyright=Copyright © 2002-2006 Rhythmbox authors +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/lirc/rblirc.plugin.in b/plugins/lirc/rblirc.plugin.in +index 7a96f42dc..4b4c86637 100644 +--- a/plugins/lirc/rblirc.plugin.in ++++ b/plugins/lirc/rblirc.plugin.in +@@ -5,4 +5,4 @@ _Name=LIRC + _Description=Control Rhythmbox using an infrared remote control + Authors=Jonathan Matthew + Copyright=Copyright © 2006 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/lyrics/lyrics.plugin.in b/plugins/lyrics/lyrics.plugin.in +index 454d0b16b..8b85ed9e5 100644 +--- a/plugins/lyrics/lyrics.plugin.in ++++ b/plugins/lyrics/lyrics.plugin.in +@@ -7,4 +7,4 @@ _Name=Song Lyrics + _Description=Fetch song lyrics from the Internet + Authors=Jonathan Matthew, Eduardo Gonzalez, Sirio Bolaños + Copyright=Copyright © 2005-2007 Jonathan Matthew, Eduardo Gonzalez, Sirio Bolaños +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/magnatune/magnatune.plugin.in b/plugins/magnatune/magnatune.plugin.in +index abcebebd9..1d46f3b30 100644 +--- a/plugins/magnatune/magnatune.plugin.in ++++ b/plugins/magnatune/magnatune.plugin.in +@@ -7,4 +7,4 @@ _Name=Magnatune Store + _Description=Adds support to Rhythmbox for playing and purchasing from the Magnatune online music store + Authors=Adam Zimmerman, James Livingston + Copyright=Copyright © 2006 Adam Zimmerman +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/mmkeys/mmkeys.plugin.in b/plugins/mmkeys/mmkeys.plugin.in +index 1376bcf36..597254e94 100644 +--- a/plugins/mmkeys/mmkeys.plugin.in ++++ b/plugins/mmkeys/mmkeys.plugin.in +@@ -6,4 +6,4 @@ _Name=Media Player Keys + _Description=Control Rhythmbox using key shortcuts + Authors=Rhythmbox authors + Copyright=Copyright © 2002-2007 Rhythmbox authors +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/mpris/mpris.plugin.in b/plugins/mpris/mpris.plugin.in +index a88b230e5..de23d73bd 100644 +--- a/plugins/mpris/mpris.plugin.in ++++ b/plugins/mpris/mpris.plugin.in +@@ -5,7 +5,7 @@ _Name=MPRIS D-Bus interface + _Description=Provides an implementation of the MPRIS D-Bus interface specification + Authors=Jonathan Matthew + Copyright=Copyright © 2010 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/mtpdevice/mtpdevice.plugin.in b/plugins/mtpdevice/mtpdevice.plugin.in +index c80edece6..3ed54ae60 100644 +--- a/plugins/mtpdevice/mtpdevice.plugin.in ++++ b/plugins/mtpdevice/mtpdevice.plugin.in +@@ -5,7 +5,7 @@ _Name=Portable Players - MTP + _Description=Support for MTP devices (show the content, transfer, play from device) + Authors=Peter Grundström + Copyright=Copyright © 2006-2007 Peter Grundström +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/notification/notification.plugin.in b/plugins/notification/notification.plugin.in +index 9aee0c04d..7dfa19047 100644 +--- a/plugins/notification/notification.plugin.in ++++ b/plugins/notification/notification.plugin.in +@@ -5,7 +5,7 @@ _Name=Notification + _Description=Notification popups + Authors=Jonathan Matthew + Copyright=Copyright © 2010 Jonathan Matthew +-Website=http://www.rhythmbox.org ++Website=https://wiki.gnome.org/Apps/Rhythmbox + + [RB] + InitiallyEnabled=true +diff --git a/plugins/power-manager/power-manager.plugin.in b/plugins/power-manager/power-manager.plugin.in +index eabfac76b..3a1da0ce3 100644 +--- a/plugins/power-manager/power-manager.plugin.in ++++ b/plugins/power-manager/power-manager.plugin.in +@@ -6,4 +6,4 @@ _Name=Power Manager + _Description=Inhibit Power Manager from suspending the machine while playing + Authors=Jonathan Matthew + Copyright=Copyright © 2006 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/pythonconsole/pythonconsole.plugin.in b/plugins/pythonconsole/pythonconsole.plugin.in +index de9f4b897..35728bf42 100644 +--- a/plugins/pythonconsole/pythonconsole.plugin.in ++++ b/plugins/pythonconsole/pythonconsole.plugin.in +@@ -6,4 +6,4 @@ _Name=Python Console + _Description=Interactive python console + Authors=Steve Frécinaux + Copyright=Copyright © 2006 Steve Frécinaux +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/rbzeitgeist/rbzeitgeist.plugin.in b/plugins/rbzeitgeist/rbzeitgeist.plugin.in +index 3d362bb00..c4758da20 100644 +--- a/plugins/rbzeitgeist/rbzeitgeist.plugin.in ++++ b/plugins/rbzeitgeist/rbzeitgeist.plugin.in +@@ -7,4 +7,4 @@ _Name=Zeitgeist + _Description=Inform Zeitgeist about your activity + Authors=Markus Korn + Copyright=Copyright © 2009 Markus Korn +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/replaygain/replaygain.plugin.in b/plugins/replaygain/replaygain.plugin.in +index b71786903..a197caa27 100644 +--- a/plugins/replaygain/replaygain.plugin.in ++++ b/plugins/replaygain/replaygain.plugin.in +@@ -7,4 +7,4 @@ _Name=ReplayGain + _Description=Use ReplayGain to provide a consistent playback volume + Authors=Jonathan Matthew + Copyright=Copyright © 2010 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox +diff --git a/plugins/soundcloud/soundcloud.plugin.in b/plugins/soundcloud/soundcloud.plugin.in +index d565817a6..2e6c2a8db 100644 +--- a/plugins/soundcloud/soundcloud.plugin.in ++++ b/plugins/soundcloud/soundcloud.plugin.in +@@ -6,5 +6,5 @@ _Name=SoundCloud + _Description=Browse and play sounds from SoundCloud® + Authors=Jonathan Matthew + Copyright=Copyright © 2014 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + Depends=rb +diff --git a/plugins/webremote/webremote.plugin.in b/plugins/webremote/webremote.plugin.in +index 9a3d967de..fed1d575c 100644 +--- a/plugins/webremote/webremote.plugin.in ++++ b/plugins/webremote/webremote.plugin.in +@@ -6,5 +6,5 @@ _Name=Web remote control + _Description=Control Rhythmbox from a web browser + Authors=Jonathan Matthew + Copyright=Copyright © 2016 Jonathan Matthew +-Website=http://www.rhythmbox.org/ ++Website=https://wiki.gnome.org/Apps/Rhythmbox + Depends=rb +-- +GitLab + diff --git a/rhythmbox.spec b/rhythmbox.spec index ba38f1a..dc0d697 100644 --- a/rhythmbox.spec +++ b/rhythmbox.spec @@ -1,17 +1,35 @@ %global gtk3_version 3.20.0 %global libdmapsharing_version 2.9.19 %global libsecret_version 0.18 +%global zeitgeist_version 1.0.3 Name: rhythmbox Summary: Music Management Application Version: 3.4.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ with exceptions and GFDL URL: https://wiki.gnome.org/Apps/Rhythmbox #VCS: git://git.gnome.org/rhythmbox Source: https://download.gnome.org/sources/rhythmbox/3.4/%{name}-%{version}.tar.xz + +# Fix xfade playback not working with gstreamer 1.18+ (#1895139) Patch0: rhythmbox-3.4.4-fix-xfade-playback.patch +# Fix obsolete website links (#1856177) +Patch1: rhythmbox-3.4.4-update-website-links.patch + +# Fix ctrl+q shortcut not working with caps-lock on +Patch2: rhythmbox-3.4.4-quit-with-key-modifiers.patch + +# Fix 'rhythmbox-client --quit' not always working +Patch3: rhythmbox-3.4.4-quit-flush-dbus.patch + +# Fix missing app icon in about dialog +Patch4: rhythmbox-3.4.4-about-dialog-missing-icon.patch + +# Fix lyrics plugin not loading lyrics +Patch5: rhythmbox-3.4.4-lyrics-not-loading.patch + BuildRequires: make BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.0 BuildRequires: pkgconfig(grilo-0.3) >= 0.3.0 @@ -55,6 +73,7 @@ Requires: media-player-info Requires: python3-gobject Requires: python3-mako Requires: gstreamer1-plugins-good +Requires: zeitgeist%{?_isa} >= %{zeitgeist_version} Obsoletes: rhythmbox-upnp < %{version}-%{release} Provides: rhythmbox-upnp = %{version}-%{release} @@ -109,10 +128,6 @@ rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/libsample-vala.so \ # Don't include header files for plugins rm -rf %{buildroot}%{_libdir}/rhythmbox/plugins/*/*.h -# Rhythmbox plugins are Python 3, but python-zeitgeist is Python 2. -# https://bugzilla.redhat.com/show_bug.cgi?id=1062912 -rm -rf %{buildroot}%{_libdir}/rhythmbox/plugins/rbzeitgeist - # Context plugin is disabled, so do not install the files. rm -rf %{buildroot}%{_libdir}/rhythmbox/plugins/context @@ -167,6 +182,7 @@ appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/rhythmbox %{_libdir}/rhythmbox/plugins/power-manager/ %{_libdir}/rhythmbox/plugins/python-console/ %{_libdir}/rhythmbox/plugins/rb/ +%{_libdir}/rhythmbox/plugins/rbzeitgeist/ %{_libdir}/rhythmbox/plugins/replaygain/ %{_libdir}/rhythmbox/plugins/soundcloud/ %{_libdir}/rhythmbox/plugins/webremote/ @@ -180,6 +196,14 @@ appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/rhythmbox %{_datadir}/gir-1.0/*.gir %changelog +* Mon Apr 12 2021 crvi - 3.4.4-9 +- Reinstate zeitgeist plugin (#1876403) +- Update plugin website links (#1856177) +- Fix ctrl+q shortcut not working with caps lock on +- Fix 'rhythmbox-client --quit' not always working +- Fix missing app icon in about dialog +- Fix lyrics plugin not loading lyrics + * Wed Jan 27 2021 Fedora Release Engineering - 3.4.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild