diff options
| -rw-r--r-- | libre/clementine/PKGBUILD | 7 | ||||
| -rw-r--r-- | libre/clementine/remove-nonfree-artwork-and-spotify.patch | 26 |
2 files changed, 15 insertions, 18 deletions
diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index 1082bbbb9..eb3c48e73 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -35,7 +35,7 @@ source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz 'moognu.png') mksha256sums=('55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617') sha256sums=('d036d4ff71bff71baf941e5f3302a5a72a2665a04252d02f2ded5b1ecd0bb880' - '8df85540364e62b1b12c818958e83eb079bc203f9ab2a542c97410c7a74aa360' + 'aecd13727a55a4556b70db73519a6ff4cecabefadedad9f952b5499aa5131711' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') mksource() { @@ -52,17 +52,18 @@ prepare() { # remove nonfree artwork and Spotify references patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch - # remove Spotifyblob folders + # remove Spotifyblob files rm -rv ext/{$pkgname-spotifyblob,lib${pkgname}-spotifyblob} # remove Spotify files + rm -rv src/internet/spotify rm -v data/icons/svg/spotify.svg rm -v data/providers/{22x22,32x32,48x48}/spotify.png rm -v data/spotify-attribution.png rm -v data/clementine-spotify-public.pem rm -v cmake/SpotifyVersion.cmake rm -v data/schema/schema-30.sql - rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + rm -v src/globalsearch/spotifysearchprovider.{cpp,h} # move free Nyan Cat replacement mascot (MooGNU) to the source code # https://labs.parabola.nu/issues/329 diff --git a/libre/clementine/remove-nonfree-artwork-and-spotify.patch b/libre/clementine/remove-nonfree-artwork-and-spotify.patch index 76b875e11..297cb5cb8 100644 --- a/libre/clementine/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine/remove-nonfree-artwork-and-spotify.patch @@ -515,7 +515,7 @@ index 5fd8fc1..36ddefe 100644 Path_CacheRoot, }; diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp -index 8ebf51c..b4d646b 100644 +index 8ebf51c..c01a16e 100644 --- a/src/covers/albumcoverloader.cpp +++ b/src/covers/albumcoverloader.cpp @@ -34,14 +34,12 @@ @@ -530,7 +530,7 @@ index 8ebf51c..b4d646b 100644 next_id_(1), - network_(new NetworkAccessManager(this)), - connected_spotify_(false) {} -+ network_(new NetworkAccessManager(this)) ++ network_(new NetworkAccessManager(this)) {} QString AlbumCoverLoader::ImageCacheDir() { return Utilities::GetConfigPath(Utilities::Path_AlbumCovers); @@ -605,7 +605,7 @@ index 4d3e4d5..5de0663 100644 }; diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp -index c3fde67..cae00d4 100644 +index c3fde67..39f4410 100644 --- a/src/engines/gstenginepipeline.cpp +++ b/src/engines/gstenginepipeline.cpp @@ -34,8 +34,6 @@ @@ -670,7 +670,7 @@ index c3fde67..cae00d4 100644 return ReplaceDecodeBin(new_bin); } -@@ -923,17 +891,6 @@ GstPadProbeReturn GstEnginePipeline::EventHandoffCallback(GstPad*, +@@ -923,17 +891,7 @@ GstPadProbeReturn GstEnginePipeline::EventHandoffCallback(GstPad*, void GstEnginePipeline::SourceDrainedCallback(GstURIDecodeBin* bin, gpointer self) { GstEnginePipeline* instance = reinterpret_cast<GstEnginePipeline*>(self); @@ -685,10 +685,11 @@ index c3fde67..cae00d4 100644 - instance->next_url_.scheme() == "spotify")) { - instance->TransitionToNext(); - } ++ instance->TransitionToNext(); } void GstEnginePipeline::SourceSetupCallback(GstURIDecodeBin* bin, -@@ -1032,24 +989,6 @@ GstState GstEnginePipeline::state() const { +@@ -1032,24 +990,6 @@ GstState GstEnginePipeline::state() const { } QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(GstState state) { @@ -734,23 +735,18 @@ index 597d904..a769489 100644 #ifdef HAVE_BOX AddService(new BoxService(app, this)); diff --git a/src/main.cpp b/src/main.cpp -index 1a961c8..515630e 100644 +index 1a961c8..87c1f34 100644 --- a/src/main.cpp +++ b/src/main.cpp -@@ -159,13 +159,6 @@ void SetEnv(const char* key, const QString& value) { +@@ -159,8 +159,6 @@ void SetEnv(const char* key, const QString& value) { #endif } -// This must be done early so that the spotify blob process also picks up -// these environment variables. --void SetGstreamerEnvironment() { -- QString scanner_path; -- QString plugin_path; -- QString registry_filename; -- - // On windows and mac we bundle the gstreamer plugins with clementine - #if defined(Q_OS_DARWIN) - scanner_path = + void SetGstreamerEnvironment() { + QString scanner_path; + QString plugin_path; diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index f9d347c..320c0fb 100644 --- a/src/playlist/playlistbackend.h |