From a7851d9349fe378d34e317ac8b93bdb2ce2671bb Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Jul 23 2017 02:23:40 +0000 Subject: set MONO_TLS_PROVIDER=legacy in banshee start script, fix dbus connections to gnome-settings-daemon, this fixes multimedia keys and networkmanager awareness, update networkmanager connection cases, many thanks to Fabrice Bellet --- diff --git a/banshee-2.6.2-fix-gnomesettings-connection.patch b/banshee-2.6.2-fix-gnomesettings-connection.patch new file mode 100644 index 0000000..a8e4c98 --- /dev/null +++ b/banshee-2.6.2-fix-gnomesettings-connection.patch @@ -0,0 +1,56 @@ +diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs.gnomesession banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs +--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs.gnomesession 2017-07-22 22:11:29.422440027 -0400 ++++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs 2017-07-22 22:11:55.030748961 -0400 +@@ -37,7 +37,7 @@ namespace Banshee.Networking + public class NetworkManager : INetworkAvailabilityService + { + [Interface ("org.freedesktop.NetworkManager")] +- private interface INetworkManager ++ public interface INetworkManager + { + event StateChangeHandler StateChange; + event StateChangeHandler StateChanged; +diff -up banshee-2.6.2/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs.gnomesession banshee-2.6.2/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs +--- banshee-2.6.2/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs.gnomesession 2017-07-22 22:12:09.598355838 -0400 ++++ banshee-2.6.2/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys/MultimediaKeysService.cs 2017-07-22 22:12:44.414416290 -0400 +@@ -44,11 +44,11 @@ namespace Banshee.MultimediaKeys + private const string BusName = "org.gnome.SettingsDaemon"; + private const string ObjectPath = "/org/gnome/SettingsDaemon"; + +- private delegate void MediaPlayerKeyPressedHandler (string application, string key); ++ public delegate void MediaPlayerKeyPressedHandler (string application, string key); + + // GNOME 2.20 + [Interface ("org.gnome.SettingsDaemon")] +- private interface ISettingsDaemon220 ++ public interface ISettingsDaemon220 + { + void GrabMediaPlayerKeys (string application, uint time); + void ReleaseMediaPlayerKeys (string application); +@@ -57,7 +57,7 @@ namespace Banshee.MultimediaKeys + + // GNOME 2.22 + [Interface ("org.gnome.SettingsDaemon.MediaKeys")] +- private interface ISettingsDaemon222 ++ public interface ISettingsDaemon222 + { + void GrabMediaPlayerKeys (string application, uint time); + void ReleaseMediaPlayerKeys (string application); +diff -up banshee-2.6.2/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs.gnomesession banshee-2.6.2/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs +--- banshee-2.6.2/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs.gnomesession 2017-07-22 22:13:00.652978078 -0400 ++++ banshee-2.6.2/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs 2017-07-22 22:13:29.612196584 -0400 +@@ -38,12 +38,12 @@ namespace Banshee.SoundMenu + private const string DBusPath = "/com/canonical/indicators/sound/service"; + private const string desktop_name = "banshee"; + +- private delegate void SoundStateUpdateHandler (int new_state); ++ public delegate void SoundStateUpdateHandler (int new_state); + + private ISoundMenu sound_menu; + + [Interface("com.canonical.indicators.sound")] +- private interface ISoundMenu ++ public interface ISoundMenu + { + bool BlacklistMediaPlayer (string player_desktop_name, bool blacklist); + bool IsBlacklisted (string player_desktop_name); diff --git a/banshee-2.6.2-fix-nm-connection-state-cases.patch b/banshee-2.6.2-fix-nm-connection-state-cases.patch new file mode 100644 index 0000000..456cab8 --- /dev/null +++ b/banshee-2.6.2-fix-nm-connection-state-cases.patch @@ -0,0 +1,14 @@ +diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs.fixnm banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs +--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs.fixnm 2017-07-22 22:15:31.176916037 -0400 ++++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.Networking/NetworkManager.cs 2017-07-22 22:15:53.335318068 -0400 +@@ -80,8 +80,8 @@ namespace Banshee.Networking + case 20: return State.Disconnected; + case 30: return State.Disconnected; + case 40: return State.Connecting; +- case 50: return State.Connected; +- case 60: return State.Connected; ++ case 50: return State.Disconnected; ++ case 60: return State.Disconnected; + case 70: return State.Connected; + } + return state; diff --git a/banshee-2.6.2-mono-tls-provider-legacy.patch b/banshee-2.6.2-mono-tls-provider-legacy.patch new file mode 100644 index 0000000..16b513f --- /dev/null +++ b/banshee-2.6.2-mono-tls-provider-legacy.patch @@ -0,0 +1,11 @@ +diff -up banshee-2.6.2/src/Clients/Booter/banshee.linux.in.monotlsprovider banshee-2.6.2/src/Clients/Booter/banshee.linux.in +--- banshee-2.6.2/src/Clients/Booter/banshee.linux.in.monotlsprovider 2017-07-22 22:09:54.752995630 -0400 ++++ banshee-2.6.2/src/Clients/Booter/banshee.linux.in 2017-07-22 22:10:16.895397704 -0400 +@@ -7,6 +7,7 @@ MONO_EXE="@expanded_libdir@/@PACKAGE@/$e + BANSHEE_EXEC_NAME=$(basename $0) + BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1" + ++export MONO_TLS_PROVIDER=legacy + export LD_LIBRARY_PATH=@expanded_libdir@/@PACKAGE@:@expanded_libdir@/@PACKAGE@/Extensions:@expanded_libdir@/@PACKAGE@/Backends:@expanded_libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH} + if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then diff --git a/banshee.spec b/banshee.spec index b829f5d..bf81553 100644 --- a/banshee.spec +++ b/banshee.spec @@ -1,6 +1,6 @@ Name: banshee Version: 2.6.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Easily import, manage, and play selections from your music collection License: MIT @@ -25,6 +25,14 @@ Patch9: banshee-2.6.2-dbus2.patch Patch10: banshee-2.6.2-cairo-fix.patch # clean up process-working exception Patch11: banshee-2.6.2-icon-fix.patch +# force MONO_TLS_PROVIDER=legacy +Patch12: banshee-2.6.2-mono-tls-provider-legacy.patch +# fix gnome-settings connection +# Thanks to Fabrice Bellet +Patch13: banshee-2.6.2-fix-gnomesettings-connection.patch +# Fix NetworkManager connection state cases +# Thanks to Fabrice Bellet +Patch14: banshee-2.6.2-fix-nm-connection-state-cases.patch # Mono only available on these: ExclusiveArch: %{mono_arches} @@ -123,6 +131,9 @@ developing extensions for %{name}. %patch9 -p1 -b .dbus2 %patch10 -p1 -b .cairofix %patch11 -p1 -b .iconfix +%patch12 -p1 -b .monotlsprovider +%patch13 -p1 -b .gnomesettings +%patch14 -p1 -b .fixnm sed -i "s#gmcs#mcs#g" configure.ac sed -i "s#gmcs#mcs#g" configure* @@ -218,6 +229,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/banshee-*.pc %changelog +* Sat Jul 22 2017 Tom Callaway - 2.6.2-22 +- set MONO_TLS_PROVIDER=legacy in banshee start script +- fix dbus connections to gnome-settings-daemon +- this fixes multimedia keys and networkmanager awareness +- update networkmanager connection cases +- many thanks to Fabrice Bellet + * Tue Jul 18 2017 Tom Callaway - 2.6.2-21 - fix up cairo warnings - fix icon warning