diff options
| author | Freemor <freemor@freemor.ca> | 2019-02-03 20:41:46 -0400 |
|---|---|---|
| committer | Freemor <freemor@freemor.ca> | 2019-02-03 20:41:46 -0400 |
| commit | 34f1a95e3cc391d2dbf2d9ab8a3d632962587847 (patch) | |
| tree | c02d2952d479af6dbe28d4e447b9c8ab269cdd3a | |
| parent | 68adb908a53814e3f18cfcce682850cbf86b98c6 (diff) | |
rebuild [libre/clementine] to fix #1984. Much thanks to CommodoreCrunch
| -rw-r--r-- | libre/clementine/PKGBUILD | 5 | ||||
| -rw-r--r-- | libre/clementine/remove-nonfree-artwork-and-spotify.patch | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index ca9319ecc..9266b9cb0 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -11,7 +11,7 @@ pkgname=clementine _pkgname=$pkgname-libre pkgver=1.3.1 -pkgrel=18.parabola2 +pkgrel=18.parabola3 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' url='http://www.clementine-player.org/' license=('GPL') @@ -43,9 +43,8 @@ sha256sums=('9b84b3b867963da265308b150746aec0faaf5bcd79f78e3363a741edda7286ec' '213a1c2eb3f3c1d2904ed855ad851c10705d04cfa20b36b843b60003469fdc1a' '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0' 'd4dbd7f09da7a554f86237476b96e3ca097117b7ab2acd706088c72203d8b64f' - 'aecd13727a55a4556b70db73519a6ff4cecabefadedad9f952b5499aa5131711' + '8978c44d38e95edd8d7fec00d64debfa78e9906653cfd47caa2b2fb5aaf45d9d' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') - mksource() { cd Clementine-${pkgver} diff --git a/libre/clementine/remove-nonfree-artwork-and-spotify.patch b/libre/clementine/remove-nonfree-artwork-and-spotify.patch index 297cb5cb8..9dc0fdbf6 100644 --- a/libre/clementine/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine/remove-nonfree-artwork-and-spotify.patch @@ -603,9 +603,9 @@ index 4d3e4d5..5de0663 100644 - static const int kMaxRedirects = 3; }; - + diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp -index c3fde67..39f4410 100644 +index c3fde67..a1188be 100644 --- a/src/engines/gstenginepipeline.cpp +++ b/src/engines/gstenginepipeline.cpp @@ -34,8 +34,6 @@ @@ -670,7 +670,7 @@ index c3fde67..39f4410 100644 return ReplaceDecodeBin(new_bin); } -@@ -923,17 +891,7 @@ GstPadProbeReturn GstEnginePipeline::EventHandoffCallback(GstPad*, +@@ -923,16 +891,8 @@ GstPadProbeReturn GstEnginePipeline::EventHandoffCallback(GstPad*, void GstEnginePipeline::SourceDrainedCallback(GstURIDecodeBin* bin, gpointer self) { GstEnginePipeline* instance = reinterpret_cast<GstEnginePipeline*>(self); @@ -684,12 +684,12 @@ index c3fde67..39f4410 100644 - !(instance->url_.scheme() != "spotify" && - instance->next_url_.scheme() == "spotify")) { - instance->TransitionToNext(); -- } -+ instance->TransitionToNext(); ++ if (instance->has_next_valid_url()) { ++ instance->TransitionToNext(); + } } - void GstEnginePipeline::SourceSetupCallback(GstURIDecodeBin* bin, -@@ -1032,24 +990,6 @@ GstState GstEnginePipeline::state() const { +@@ -1032,24 +992,6 @@ GstState GstEnginePipeline::state() const { } QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(GstState state) { |