diff --git a/SOURCES/0001-metadata-GDBusServer-new-connection-signal-needs-a-r.patch b/SOURCES/0001-metadata-GDBusServer-new-connection-signal-needs-a-r.patch new file mode 100644 index 0000000..3ccc3c5 --- /dev/null +++ b/SOURCES/0001-metadata-GDBusServer-new-connection-signal-needs-a-r.patch @@ -0,0 +1,55 @@ +From 76540fdaa7baf56b01d8d269cbe482b1dbc58f09 Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew +Date: Fri, 13 Sep 2013 22:19:13 +1000 +Subject: [PATCH] metadata: GDBusServer new-connection signal needs a return + value + +Turns out this is kind of important and has been working mostly by +luck until now. When compiled with gcc's -fstack-protector-strong, +we ended up returning 0, which in this case means that the connection +isn't interesting, so it stops processing messages on it. + +https://bugzilla.gnome.org/show_bug.cgi?id=706470 +--- + metadata/rb-metadata-dbus-service.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/metadata/rb-metadata-dbus-service.c b/metadata/rb-metadata-dbus-service.c +index cb29d33..8280b2c 100644 +--- a/metadata/rb-metadata-dbus-service.c ++++ b/metadata/rb-metadata-dbus-service.c +@@ -220,7 +220,7 @@ connection_closed_cb (GDBusConnection *connection, + svc->connection = NULL; + } + +-static void ++static gboolean + new_connection_cb (GDBusServer *server, + GDBusConnection *connection, + ServiceData *svc) +@@ -231,7 +231,7 @@ new_connection_cb (GDBusServer *server, + /* don't allow more than one connection at a time */ + if (svc->connection) { + rb_debug ("metadata service already has a client. go away."); +- return; ++ return FALSE; + } + g_dbus_connection_register_object (connection, + RB_METADATA_DBUS_OBJECT_PATH, +@@ -243,11 +243,13 @@ new_connection_cb (GDBusServer *server, + if (error != NULL) { + rb_debug ("unable to register metadata object: %s", error->message); + g_clear_error (&error); ++ return FALSE; + } else { + svc->connection = g_object_ref (connection); + g_signal_connect (connection, "closed", G_CALLBACK (connection_closed_cb), svc); + + g_dbus_connection_set_exit_on_close (connection, (svc->external == FALSE)); ++ return TRUE; + } + } + +-- +1.8.5.3 + diff --git a/SPECS/rhythmbox.spec b/SPECS/rhythmbox.spec index 6dac482..b3b10a0 100644 --- a/SPECS/rhythmbox.spec +++ b/SPECS/rhythmbox.spec @@ -5,13 +5,17 @@ Name: rhythmbox Summary: Music Management Application Version: 2.99.1 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ with exceptions and GFDL Group: Applications/Multimedia URL: http://projects.gnome.org/rhythmbox/ #VCS: git://git.gnome.org/rhythmbox Source: http://download.gnome.org/sources/rhythmbox/2.99/%{name}-%{version}.tar.xz +# https://bugzilla.redhat.com/show_bug.cgi?id=1074974 +# https://bugzilla.gnome.org/show_bug.cgi?id=706470 +Patch0: 0001-metadata-GDBusServer-new-connection-signal-needs-a-r.patch + Requires: gnome-icon-theme-legacy Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: libdmapsharing%{?_isa} >= %{libdmapsharing_version} @@ -74,6 +78,7 @@ a Rhythmbox plugin. %prep %setup -q +%patch0 -p1 %build %configure \ @@ -171,6 +176,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %{_datadir}/gir-1.0/*.gir %changelog +* Thu Mar 13 2014 Bastien Nocera 2.99.1-3 +- Fix import failing for all file types +Resolves: #1074974 + +* Fri Dec 27 2013 Daniel Mach - 2.99.1-2 +- Mass rebuild 2013-12-27 + * Sat Apr 13 2013 Kalev Lember 2.99.1-1 - Update to 2.99.1