diff --git a/1018-Fix-reference-to-gtk-stock-icons.patch b/1018-Fix-reference-to-gtk-stock-icons.patch new file mode 100644 index 0000000..07eb935 --- /dev/null +++ b/1018-Fix-reference-to-gtk-stock-icons.patch @@ -0,0 +1,32 @@ +From 46590084ade13f5edc6c8046275ada1709501016 Mon Sep 17 00:00:00 2001 +From: Fabrice Bellet +Date: Wed, 24 Jul 2019 21:22:37 +0200 +Subject: [PATCH] Fix reference to gtk stock icons + +--- + src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs +index facf99ff4..207719e5a 100644 +--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs ++++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs +@@ -49,14 +49,13 @@ namespace Banshee.Dap.Gui + public DapActions () : base ("dap") + { + AddImportant ( +- new ActionEntry ("SyncDapAction", null, ++ new ActionEntry ("SyncDapAction", Stock.Refresh, + Catalog.GetString ("Sync"), null, + String.Empty, OnSyncDap) + ); + + AddUiFromFile ("GlobalUI.xml"); + +- this["SyncDapAction"].IconName = Stock.Refresh; + ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged; + Actions.SourceActions.Updated += delegate { UpdateActions (); }; + OnActiveSourceChanged (null); +-- +2.21.0 + diff --git a/banshee-2.6.2-fix-CollectionExtensions-disambiguation.patch b/banshee-2.6.2-fix-CollectionExtensions-disambiguation.patch new file mode 100644 index 0000000..fd2ec49 --- /dev/null +++ b/banshee-2.6.2-fix-CollectionExtensions-disambiguation.patch @@ -0,0 +1,12 @@ +diff -up banshee-2.6.2/src/Core/Banshee.Services/Banshee.Preferences/Collection.cs.spotfix banshee-2.6.2/src/Core/Banshee.Services/Banshee.Preferences/Collection.cs +--- banshee-2.6.2/src/Core/Banshee.Services/Banshee.Preferences/Collection.cs.spotfix 2019-07-29 15:14:20.349492489 -0400 ++++ banshee-2.6.2/src/Core/Banshee.Services/Banshee.Preferences/Collection.cs 2019-07-29 15:14:38.901104368 -0400 +@@ -46,7 +46,7 @@ namespace Banshee.Preferences + { + lock (this) { + if (item is Page || item is Section) { +- CollectionExtensions.SortedInsert (list, item); ++ Hyena.Collections.CollectionExtensions.SortedInsert (list, item); + } else { + list.Add (item); + } diff --git a/banshee.spec b/banshee.spec index e6f5899..92e49f2 100644 --- a/banshee.spec +++ b/banshee.spec @@ -1,6 +1,6 @@ Name: banshee Version: 2.6.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Easily import, manage, and play selections from your music collection License: MIT @@ -35,6 +35,9 @@ Patch13: banshee-2.6.2-fix-gnomesettings-connection.patch Patch14: banshee-2.6.2-fix-nm-connection-state-cases.patch # Convert failed xml streams from dos2unix and retry Patch15: banshee-2.6.2-dos2unix-xml.patch +# More fixes from Fabrice Bellet +Patch16: 1018-Fix-reference-to-gtk-stock-icons.patch +Patch17: banshee-2.6.2-fix-CollectionExtensions-disambiguation.patch # Mono only available on these: ExclusiveArch: %{mono_arches} @@ -137,6 +140,8 @@ developing extensions for %{name}. %patch13 -p1 -b .gnomesettings %patch14 -p1 -b .fixnm %patch15 -p1 -b .dos2unix +%patch16 -p1 -b .iconfix2 +%patch17 -p1 -b .fixCollectionExtensions sed -i "s#gmcs#mcs#g" configure.ac sed -i "s#gmcs#mcs#g" configure* @@ -215,6 +220,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/banshee*.desktop %{_libdir}/pkgconfig/banshee-*.pc %changelog +* Mon Jul 29 2019 Tom Callaway - 2.6.2-34 +- apply fixes from Fabrice Bellet + * Wed Jul 24 2019 Fedora Release Engineering - 2.6.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild