diff options
Diffstat (limited to 'nonprism/banshee')
| -rw-r--r-- | nonprism/banshee/PKGBUILD | 22 | ||||
| -rw-r--r-- | nonprism/banshee/nonprism.patch | 238 | ||||
| -rw-r--r-- | nonprism/banshee/sqlite_fix.patch | 11 |
3 files changed, 259 insertions, 12 deletions
diff --git a/nonprism/banshee/PKGBUILD b/nonprism/banshee/PKGBUILD index 0b579dad1..b813b25bc 100644 --- a/nonprism/banshee/PKGBUILD +++ b/nonprism/banshee/PKGBUILD @@ -5,9 +5,9 @@ pkgname=banshee pkgver=2.6.2 -pkgrel=7.nonprism1 -pkgdesc="Music management and playback for GNOME, without gdata-sharp support" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=8.nonprism1 +pkgdesc="Music management and playback for GNOME, without gdata-sharp, Ubuntu One Music store and Amazon MP3 store support" +arch=('i686' 'x86_64') url="http://banshee.fm/" license=('MIT') depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp gst-plugins-good gvfs) @@ -25,15 +25,17 @@ source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch sqlite_fix.patch Remove-IDBusExportable-inheritance-from-exported-int.patch - Use-dbus-2.patch) + Use-dbus-2.patch + nonprism.patch) md5sums=('12dbb8a996783f7081d538062a8589b7' '16cbe2ef60e6f9b22015585bb3209648' '0bf7ee4241b12538779c9ecc401d142a' 'f87534f54029794bd7be2a123ab01300' 'd092827720e4a11549587eb3131123ae' - '72ca131b950d58998fd9286fad722ed7' + '2677e6edc2e0d2ce8994adc852dda362' '3b28f10e167c0aae27157dcc3b828b67' - '2c4436f7aba58fdd0c5a38d709d73e5c') + '2c4436f7aba58fdd0c5a38d709d73e5c' + '6de2436fb9683866f77e71fa8e139b7b') prepare() { cd $pkgname-$pkgver @@ -44,6 +46,11 @@ prepare() { patch -p1 -i ../sqlite_fix.patch patch -p1 -i ../Remove-IDBusExportable-inheritance-from-exported-int.patch patch -p1 -i ../Use-dbus-2.patch + # Remove Amazon MP3 store extension since it's mandatory from the building + patch -p1 -i ../nonprism.patch + rm -rv src/Extensions/Banshee.AmazonMp3{,.Store} + rm -rv src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs + rm -v src/Dap/Banshee.Dap.MassStorage/ThemeIcons/{16x16,22x22}/categories/amazon-mp3-source.png } build() { @@ -52,7 +59,7 @@ build() { cd $pkgname-$pkgver - # Disable youtube extension because it needs gdata-sharp to works + # Disable Youtube extension because it needs gdata-sharp to works. Also disable Ubuntu One Music store too. MCS=/usr/bin/dmcs ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-docs \ --disable-static \ @@ -60,6 +67,7 @@ build() { --disable-schemas-install \ --disable-boo \ --disable-youtube \ + --disable-ubuntuone \ --with-vendor-build-id=Parabola make } diff --git a/nonprism/banshee/nonprism.patch b/nonprism/banshee/nonprism.patch new file mode 100644 index 000000000..63b35b60a --- /dev/null +++ b/nonprism/banshee/nonprism.patch @@ -0,0 +1,238 @@ +diff -Nur banshee-2.6.2.orig/configure banshee-2.6.2/configure +--- banshee-2.6.2.orig/configure 2014-02-18 20:18:09.000000000 -0200 ++++ banshee-2.6.2/configure 2016-01-28 10:05:18.263004034 -0300 +@@ -21159,7 +21159,7 @@ + + + +-ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile help/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile src/Hyena/Makefile src/Hyena/build/Makefile src/Hyena/build/pkg-config/Makefile src/Hyena/build/m4/Makefile src/Hyena/Hyena/Makefile src/Hyena/Hyena.Data.Sqlite/Makefile src/Hyena/Hyena.Gui/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee.linux src/Clients/Booter/banshee.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Core/Banshee.WebBrowser/Makefile src/Core/Banshee.WebBrowser/libossifer/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.GStreamerSharp/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Backends/Banshee.Windows/Makefile src/Libraries/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.AppleDevice/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.AmazonMp3/Makefile src/Extensions/Banshee.AmazonMp3.Store/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.Emusic.Store/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.Fixup/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LastfmStreaming/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MiroGuide/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.Mpris/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.OpticalDisc/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SoundMenu/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.UbuntuOneMusicStore/Makefile src/Extensions/Banshee.UPnPClient/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile" ++ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile help/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile src/Hyena/Makefile src/Hyena/build/Makefile src/Hyena/build/pkg-config/Makefile src/Hyena/build/m4/Makefile src/Hyena/Hyena/Makefile src/Hyena/Hyena.Data.Sqlite/Makefile src/Hyena/Hyena.Gui/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee.linux src/Clients/Booter/banshee.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Core/Banshee.WebBrowser/Makefile src/Core/Banshee.WebBrowser/libossifer/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.GStreamerSharp/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Backends/Banshee.Windows/Makefile src/Libraries/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.AppleDevice/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.Emusic.Store/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.Fixup/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LastfmStreaming/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MiroGuide/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.Mpris/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.OpticalDisc/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SoundMenu/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.UbuntuOneMusicStore/Makefile src/Extensions/Banshee.UPnPClient/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -22522,8 +22522,6 @@ + "src/Dap/Banshee.Dap.Mtp/Makefile") CONFIG_FILES="$CONFIG_FILES src/Dap/Banshee.Dap.Mtp/Makefile" ;; + "src/Dap/Banshee.Dap.Karma/Makefile") CONFIG_FILES="$CONFIG_FILES src/Dap/Banshee.Dap.Karma/Makefile" ;; + "src/Extensions/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Makefile" ;; +- "src/Extensions/Banshee.AmazonMp3/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.AmazonMp3/Makefile" ;; +- "src/Extensions/Banshee.AmazonMp3.Store/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.AmazonMp3.Store/Makefile" ;; + "src/Extensions/Banshee.Audiobook/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Audiobook/Makefile" ;; + "src/Extensions/Banshee.BooScript/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.BooScript/Makefile" ;; + "src/Extensions/Banshee.Bpm/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Bpm/Makefile" ;; +diff -Nur banshee-2.6.2.orig/configure.ac banshee-2.6.2/configure.ac +--- banshee-2.6.2.orig/configure.ac 2014-02-18 20:16:10.000000000 -0200 ++++ banshee-2.6.2/configure.ac 2016-01-28 10:05:24.692721539 -0300 +@@ -317,8 +317,6 @@ + src/Dap/Banshee.Dap.Karma/Makefile + + src/Extensions/Makefile +-src/Extensions/Banshee.AmazonMp3/Makefile +-src/Extensions/Banshee.AmazonMp3.Store/Makefile + src/Extensions/Banshee.Audiobook/Makefile + src/Extensions/Banshee.BooScript/Makefile + src/Extensions/Banshee.Bpm/Makefile +diff -Nur banshee-2.6.2.orig/help/Makefile.am banshee-2.6.2/help/Makefile.am +--- banshee-2.6.2.orig/help/Makefile.am 2014-02-18 18:40:14.000000000 -0200 ++++ banshee-2.6.2/help/Makefile.am 2016-01-28 10:26:11.551273284 -0300 +@@ -9,7 +9,6 @@ + add-podcast.page \ + add-radio.page \ + advanced.page \ +- amazon.page \ + emusic.page \ + extensions.page \ + import.page \ +diff -Nur banshee-2.6.2.orig/help/Makefile.in banshee-2.6.2/help/Makefile.in +--- banshee-2.6.2.orig/help/Makefile.in 2014-02-18 20:18:03.000000000 -0200 ++++ banshee-2.6.2/help/Makefile.in 2016-01-28 10:26:18.097652333 -0300 +@@ -525,7 +525,6 @@ + @HAVE_GNOME_DOC_UTILS_TRUE@ add-podcast.page \ + @HAVE_GNOME_DOC_UTILS_TRUE@ add-radio.page \ + @HAVE_GNOME_DOC_UTILS_TRUE@ advanced.page \ +-@HAVE_GNOME_DOC_UTILS_TRUE@ amazon.page \ + @HAVE_GNOME_DOC_UTILS_TRUE@ emusic.page \ + @HAVE_GNOME_DOC_UTILS_TRUE@ extensions.page \ + @HAVE_GNOME_DOC_UTILS_TRUE@ import.page \ +diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs +--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs 2014-02-18 18:35:24.000000000 -0200 ++++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs 2016-01-28 10:42:56.130469744 -0300 +@@ -55,7 +55,6 @@ + + private static string [] audio_folders = new string [] { + "Music/", +- "amazonmp3/", + "Video/" + }; + +@@ -69,17 +68,6 @@ + + private static string playlists_path = "Music/Playlists/"; + +- private AmazonMp3GroupSource amazon_source; +- private string amazon_base_dir; +- +- public override void SourceInitialize () +- { +- amazon_base_dir = System.IO.Path.Combine (Source.Volume.MountPoint, audio_folders[1]); +- +- amazon_source = new AmazonMp3GroupSource (Source, "amazonmp3", amazon_base_dir); +- amazon_source.AutoHide = true; +- } +- + public override bool LoadDeviceConfiguration () + { + LoadConfig (); +@@ -156,31 +144,5 @@ + return true; + } + +-#region Amazon MP3 Store Purchased Tracks Management +- +- public override bool DeleteTrackHook (DatabaseTrackInfo track) +- { +- // Do not allow removing purchased tracks if not in the +- // Amazon Purchased Music source; this should prevent +- // accidental deletion of purchased music that may not +- // have been copied from the device yet. +- // +- // TODO: Provide some feedback when a purchased track is +- // skipped from deletion +- // +- // FIXME: unfortunately this does not work due to +- // the cache models being potentially different +- // even though they will always reference the same tracks +- // amazon_source.TrackModel.IndexOf (track) >= 0 +- +- if (!amazon_source.Active && amazon_source.Count > 0 && track.Uri.LocalPath.StartsWith (amazon_base_dir)) { +- return false; +- } +- +- return true; +- } +- +-#endregion +- + } + } +diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs +--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs 2014-02-18 18:35:24.000000000 -0200 ++++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/WebOSDevice.cs 2016-01-28 10:43:27.961879764 -0300 +@@ -86,8 +86,7 @@ + private static string [] audio_folders = new string [] { + "Music/", + "Videos/", +- //"ringtones/", +- "AmazonMP3/" ++ //"ringtones/" + }; + + private static string [] video_folders = new string [] { +@@ -98,22 +97,8 @@ + "phone-palm-pre", DapSource.FallbackIcon + }; + +- private AmazonMp3GroupSource amazon_source; +- private string amazon_base_dir; +- + private RingtonesGroupSource ringtones_source; + +- public override void SourceInitialize () +- { +- amazon_base_dir = System.IO.Path.Combine (Source.Volume.MountPoint, audio_folders[2]); +- +- amazon_source = new AmazonMp3GroupSource (Source, "AmazonMP3", amazon_base_dir); +- amazon_source.AutoHide = true; +- +- ringtones_source = new RingtonesGroupSource (Source); +- ringtones_source.AutoHide = true; +- } +- + public override bool LoadDeviceConfiguration () + { + LoadConfig (); +@@ -161,31 +146,6 @@ + return icon_names; + } + +-#region Amazon MP3 Store Purchased Tracks Management +- +- public override bool DeleteTrackHook (DatabaseTrackInfo track) +- { +- // Do not allow removing purchased tracks if not in the +- // Amazon Purchased Music source; this should prevent +- // accidental deletion of purchased music that may not +- // have been copied from the device yet. +- // +- // TODO: Provide some feedback when a purchased track is +- // skipped from deletion +- // +- // FIXME: unfortunately this does not work due to +- // the cache models being potentially different +- // even though they will always reference the same tracks +- // amazon_source.TrackModel.IndexOf (track) >= 0 +- if (!amazon_source.Active && amazon_source.Count > 0 && track.Uri.LocalPath.StartsWith (amazon_base_dir)) { +- return false; +- } +- +- return true; +- } +- +-#endregion +- + #region Ringtones Support + + private class RingtonesGroupSource : MediaGroupSource +diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.am banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.am +--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.am 2014-02-18 18:40:14.000000000 -0200 ++++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.am 2016-01-28 10:36:41.750251726 -0300 +@@ -4,7 +4,6 @@ + INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR) + + SOURCES = \ +- Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs \ + Banshee.Dap.MassStorage/AndroidDevice.cs \ + Banshee.Dap.MassStorage/CustomMassStorageDevice.cs \ + Banshee.Dap.MassStorage/DeviceMapper.cs \ +diff -Nur banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.in +--- banshee-2.6.2.orig/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2014-02-18 20:18:05.000000000 -0200 ++++ banshee-2.6.2/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2016-01-28 10:33:46.404622326 -0300 +@@ -422,7 +422,6 @@ + LINK = $(REF_DAP_MASS_STORAGE) $(am__append_1) + INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR) + SOURCES = \ +- Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs \ + Banshee.Dap.MassStorage/AndroidDevice.cs \ + Banshee.Dap.MassStorage/CustomMassStorageDevice.cs \ + Banshee.Dap.MassStorage/DeviceMapper.cs \ +@@ -557,9 +556,6 @@ + REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS) + + # Extensions +-LINK_EXTENSION_AMAZONMP3 = -r:$(DIR_BIN)/Banshee.AmazonMp3.exe +-REF_EXTENSION_AMAZONMP3 = $(LINK_BANSHEE_THICKCLIENT_DEPS) +-REF_EXTENSION_AMAZONMP3_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_AMAZONMP3) + REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO) + REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS) + REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS) +diff -Nur banshee-2.6.2.orig/src/Extensions/Makefile.am banshee-2.6.2/src/Extensions/Makefile.am +--- banshee-2.6.2.orig/src/Extensions/Makefile.am 2014-02-18 18:40:14.000000000 -0200 ++++ banshee-2.6.2/src/Extensions/Makefile.am 2016-01-28 10:05:54.838063750 -0300 +@@ -1,6 +1,4 @@ + SUBDIRS = \ +- Banshee.AmazonMp3 \ +- Banshee.AmazonMp3.Store \ + Banshee.Audiobook \ + Banshee.BooScript \ + Banshee.Bpm \ +diff -Nur banshee-2.6.2.orig/src/Extensions/Makefile.in banshee-2.6.2/src/Extensions/Makefile.in +--- banshee-2.6.2.orig/src/Extensions/Makefile.in 2014-02-18 20:18:07.000000000 -0200 ++++ banshee-2.6.2/src/Extensions/Makefile.in 2016-01-28 10:06:01.174452024 -0300 +@@ -424,8 +424,6 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = \ +- Banshee.AmazonMp3 \ +- Banshee.AmazonMp3.Store \ + Banshee.Audiobook \ + Banshee.BooScript \ + Banshee.Bpm \ diff --git a/nonprism/banshee/sqlite_fix.patch b/nonprism/banshee/sqlite_fix.patch index 880f6ed9f..7dfa53817 100644 --- a/nonprism/banshee/sqlite_fix.patch +++ b/nonprism/banshee/sqlite_fix.patch @@ -124,7 +124,7 @@ diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs b index e9bbbf5..3ae0728 100644 --- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs +++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs -@@ -52,6 +52,16 @@ namespace Banshee.Database +@@ -52,6 +52,20 @@ namespace Banshee.Database get { return configuration; } } @@ -132,7 +132,11 @@ index e9bbbf5..3ae0728 100644 + public bool LikelihoodSupport { + get { + if (!likelihood_support.HasValue) { -+ likelihood_support = Query<bool> ("SELECT sqlite_version () >= '3.8.1'"); ++ // emulate the SQLITE_VERSION_NUMBER macro ++ string[] v = Query<string> ("SELECT sqlite_version ()").Split ('.'); ++ likelihood_support = (Int32.Parse (v[0]) * 1000000 + ++ Int32.Parse (v[1]) * 1000 + ++ Int32.Parse (v[2])) >= 3008001; + } + return likelihood_support.Value; + } @@ -140,7 +144,4 @@ index e9bbbf5..3ae0728 100644 + public BansheeDbConnection () : this (DatabaseFile) { - validate_schema = ApplicationContext.CommandLine.Contains ("validate-db-schema"); --- -cgit v0.10.1 |