Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=647173e11e01667306078159f5aea5521c57a7a5
commit 647173e11e01667306078159f5aea5521c57a7a5 Author: Baste <[email protected]> Date: Tue Oct 1 16:19:05 2013 +0200 rhythmbox-3.0-2-x86_64 *Add patch *Add rodep diff --git a/source/gnome/rhythmbox/FrugalBuild b/source/gnome/rhythmbox/FrugalBuild index c4b6b68..105adbe 100644 --- a/source/gnome/rhythmbox/FrugalBuild +++ b/source/gnome/rhythmbox/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling time: 5.03 SBU +# Compiling time: 5.43 SBU # Maintainer: bouleetbil <[email protected]> # Contributor: AlexExtreme <[email protected]> @@ -6,13 +6,14 @@ options+=('asneeded') pkgname=rhythmbox pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A music management application for GNOME" url="http://www.rhythmbox.org/"; depends=('libsoup-gnome>=2.4.0' 'json-glib' 'libpeas-gtk' 'tdb' 'totem-pl-parser' 'gst1-plugins-base' \ 'libdmapsharing' 'libnotify' 'brasero' 'clutter-gst' 'clutter-gtk' 'libsecret' 'mx') makedepends=('gnome-common' 'intltool' 'gobject-introspection' 'vala' 'gtk-doc' 'yelp-tools' \ 'libgpod' 'libmtp' 'grilo') +rodepends=('gst1-plugins-ugly-mad') replaces=('rhythmbox-desktop-art') groups=('gnome') archs=('i686' 'x86_64') @@ -24,12 +25,14 @@ _F_gnome_devel="n" _F_gnome_doc="y" _F_gnome_ext=".tar.xz" Finclude gnome-scriptlet gnome +source=($source gdbusserver.patch) unset MAKEFLAGS Fconfopts+=" --enable-daap --enable-python --without-hal \ --with-brasero --enable-vala" -sha1sums=('594b87df4ba10df9fedf8b7285f02b6aa3a377aa') +sha1sums=('594b87df4ba10df9fedf8b7285f02b6aa3a377aa' \ + 'd4ef5ff9a949408645cf2a35598e01fabfd9f965') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi diff --git a/source/gnome/rhythmbox/gdbusserver.patch b/source/gnome/rhythmbox/gdbusserver.patch new file mode 100644 index 0000000..1bba33b --- /dev/null +++ b/source/gnome/rhythmbox/gdbusserver.patch @@ -0,0 +1,51 @@ +From 76540fdaa7baf56b01d8d269cbe482b1dbc58f09 Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew <[email protected]> +Date: Fri, 13 Sep 2013 12:19:13 +0000 +Subject: 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 +--- +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; + } + } + +-- +cgit v0.9.2 + diff --git a/source/gnome/rhythmbox/gl.patch b/source/gnome/rhythmbox/gl.patch new file mode 100644 index 0000000..1bba33b --- /dev/null +++ b/source/gnome/rhythmbox/gl.patch @@ -0,0 +1,51 @@ +From 76540fdaa7baf56b01d8d269cbe482b1dbc58f09 Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew <[email protected]> +Date: Fri, 13 Sep 2013 12:19:13 +0000 +Subject: 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 +--- +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; + } + } + +-- +cgit v0.9.2 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
