From 26741993aa7013dce7c2a79359ff7832cf5e2f90 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Feb 27 2017 18:36:12 +0000 Subject: dbus2 --- diff --git a/banshee-2.6.2-dbus2.patch b/banshee-2.6.2-dbus2.patch new file mode 100644 index 0000000..0b2c7a6 --- /dev/null +++ b/banshee-2.6.2-dbus2.patch @@ -0,0 +1,12 @@ +diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs.dbus2 banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs +--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs.dbus2 2017-02-27 11:52:23.387595348 -0500 ++++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs 2017-02-27 11:52:30.394410958 -0500 +@@ -137,7 +137,7 @@ namespace Banshee.ServiceStack + Log.DebugFormat ("Registering remote object {0} ({1}) on {2}", path, o.GetType (), bus_name); + + #pragma warning disable 0618 +- Bus.Session.Register (bus_name, path, o); ++ Bus.Session.Register (path, o); + #pragma warning restore 0618 + } + diff --git a/banshee.spec b/banshee.spec index 4d27aef..d509f7c 100644 --- a/banshee.spec +++ b/banshee.spec @@ -1,6 +1,6 @@ Name: banshee Version: 2.6.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Easily import, manage, and play selections from your music collection License: MIT @@ -19,6 +19,8 @@ Patch7: banshee-2.6.2-gst1.0-handle-events-fix.patch # Add sqlite-hints # https://bugzilla.gnome.org/show_bug.cgi?id=740879 Patch8: banshee-2.6.2-sqlite-hints.patch +# Support dbus-sharp 2.0 +Patch9: banshee-2.6.2-dbus2.patch # Mono only available on these: ExclusiveArch: %{mono_arches} @@ -48,7 +50,7 @@ BuildRequires: gnome-sharp-devel notify-sharp-devel BuildRequires: libgpod-sharp-devel >= 0.8.2 %endif BuildRequires: gdata-sharp-devel -BuildRequires: dbus-sharp-devel >= 1:0.7.0 +BuildRequires: dbus-sharp-devel >= 1:0.8.0 BuildRequires: dbus-sharp-glib-devel # Extra mono deps @@ -113,6 +115,7 @@ developing extensions for %{name}. %patch6 -p1 %patch7 -p1 -b .handle-events-fix %patch8 -p1 -b .sqlite-hints +%patch9 -p1 -b .dbus2 sed -i "s#gmcs#mcs#g" configure.ac sed -i "s#gmcs#mcs#g" configure* @@ -121,6 +124,9 @@ sed -i "s#gmcs#mcs#g" src/Libraries/Lastfm/Makefile.* sed -i "s#gmcs#mcs#g" Makefile.* sed -i "s#gmcs#mcs#g" src/Hyena/build/m4/shamrock/mono.m4 sed -i "s#gmcs#mcs#g" build/m4/shamrock/mono.m4 +#dbus2 +sed -i "s#dbus-sharp-glib-1.0#dbus-sharp-glib-2.0#g" build/m4/banshee/dbus.m4 +sed -i "s#dbus-sharp-1.0#dbus-sharp-2.0#g" build/m4/banshee/dbus.m4 %build NOCONFIGURE=1 ./autogen.sh @@ -205,6 +211,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/banshee-*.pc %changelog +* Mon Feb 27 2017 Tom Callaway - 2.6.2-19 +- rebuild for dbus-sharp[-glib] + * Fri Feb 10 2017 Fedora Release Engineering - 2.6.2-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild