libre/clementine: updated to 1.3.1.r831.664c5a31f

2 files changed, 47 insertions, 34 deletions

diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD
index fb7a7f804..4f8ba2316 100644
--- a/libre/clementine/PKGBUILD
+++ b/libre/clementine/PKGBUILD
@@ -16,7 +16,7 @@
 
 pkgname=clementine
 _pkgname=$pkgname-libre
-pkgver=1.3.1.r702.3b76fa627
+pkgver=1.3.1.r831.664c5a31f
 pkgrel=2
 pkgrel+=.par1
 pkgdesc='A modern music player and library organizer'
@@ -64,14 +64,14 @@ optdepends=(
   'gvfs: Various devices support'
 )
 source=(
-  git+https://github.com/clementine-player/Clementine.git#commit=3b76fa62752f25b445ee2a71f02c0c9d7581735a
+  git+https://github.com/clementine-player/Clementine.git#commit=664c5a31f9cf519af5a4c3adcb30dbbc73d037d6
   clementine-gcc6.patch
   remove-nonfree-artwork-and-spotify.patch
   moognu.png
 )
 sha256sums=('SKIP'
             '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee'
-            '0680a1efc5f24a2662be42ba5a23d2278ce707c76104c03a3d693f7a890358b8'
+            '75536b5290ebcd6126d9e8796c3f15a0b0d5339257060ebab511dfe665d64e32'
             'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
 
 pkgver() {
@@ -90,6 +90,12 @@ prepare() {
 
   # Fix build with GCC 6
   patch -p1 -i ../clementine-gcc6.patch
+  # https://github.com/clementine-player/Clementine/pull/5630
+  git cherry-pick -n 8a6cc8b5069265e1e92e22def985e22c5955e503
+  # FS#58413
+  git cherry-pick -n -m 1 75f9439843a0e9cdc26cd739d5e1dbd93bd974bc
+  # Fix DI.FM
+  git cherry-pick -n ddfa5e63f1ef0e243a007efbe576fceb9b2442e8
 
   # remove nonfree artwork for the Nyan Cat plugin
   # 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 d2810a93b..51efefd6d 100644
--- a/libre/clementine/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine/remove-nonfree-artwork-and-spotify.patch
@@ -30,11 +30,12 @@ index 657efdbac..cd2484e47 100644
  pkg_check_modules(TAGLIB taglib)
  
  if (WIN32)
-@@ -164,11 +162,6 @@ endif()
+@@ -164,12 +162,6 @@ endif()
  
  if (APPLE)
    find_library(SPARKLE Sparkle)
 -  find_library(LIBSPOTIFY libspotify)
+-
 -  if(LIBSPOTIFY_FOUND)
 -    set(LIBSPOTIFY_INCLUDE_DIRS ${LIBSPOTIFY})
 -    set(LIBSPOTIFY_LIBRARIES ${LIBSPOTIFY})
@@ -42,10 +43,15 @@ index 657efdbac..cd2484e47 100644
  
    add_subdirectory(3rdparty/SPMediaKeyTap)
    set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
-@@ -292,20 +285,6 @@ optional_component(UDISKS2 ON "Devices: UDisks2 backend"
+@@ -293,19 +285,6 @@ optional_component(UDISKS2 ON "Devices:
    DEPENDS "D-Bus support" Qt5DBus_FOUND
  )
  
+-optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
+-  DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
+-  DEPENDS "libspotify" LIBSPOTIFY_FOUND
+-)
+-
 -if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB)
 -  set(CRYPTOPP_OR_HAVE_SPOTIFY_BLOB ON)
 -endif()
@@ -54,12 +60,6 @@ index 657efdbac..cd2484e47 100644
 -  DEPENDS "cryptopp or spotify blob" CRYPTOPP_OR_HAVE_SPOTIFY_BLOB
 -)
 -
--optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
--  DEPENDS "spotify support" HAVE_SPOTIFY
--  DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
--  DEPENDS "libspotify" LIBSPOTIFY_FOUND
--)
--
  optional_component(MOODBAR ON "Moodbar support"
    DEPENDS "fftw3" FFTW3_FOUND
  )
@@ -73,7 +73,7 @@ index 657efdbac..cd2484e47 100644
  endif(CRYPTOPP_FOUND)
  
  # Remove GLU and GL from the link line - they're not really required
-@@ -451,9 +427,6 @@ add_subdirectory(ext/libclementine-common)
+@@ -451,9 +427,6 @@ add_subdirectory(ext/libclementine-commo
  add_subdirectory(ext/libclementine-tagreader)
  add_subdirectory(ext/clementine-tagreader)
  add_subdirectory(ext/libclementine-remote)
@@ -300,7 +300,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index d635aee7c..56e01c09d 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -47,10 +47,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-tagreader)
+@@ -47,10 +47,6 @@ include_directories(${CMAKE_SOURCE_DIR}/
  include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
  include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-remote)
  include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-remote)
@@ -394,7 +394,7 @@ diff --git a/src/analyzers/rainbowanalyzer.cpp b/src/analyzers/rainbowanalyzer.c
 index 7cb0b44c2..25bfb843d 100644
 --- a/src/analyzers/rainbowanalyzer.cpp
 +++ b/src/analyzers/rainbowanalyzer.cpp
-@@ -42,7 +42,7 @@ const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = {21, 16};
+@@ -42,7 +42,7 @@ const int Rainbow::RainbowAnalyzer::kRai
  const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = {13, 15};
  const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = {24, 33};
  
@@ -403,7 +403,7 @@ index 7cb0b44c2..25bfb843d 100644
  const char* Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";
  const float Rainbow::RainbowAnalyzer::kPixelScale = 0.02f;
  
-@@ -59,7 +59,7 @@ Rainbow::RainbowAnalyzer::RainbowAnalyzer(const RainbowType& rbtype,
+@@ -59,7 +59,7 @@ Rainbow::RainbowAnalyzer::RainbowAnalyze
        x_offset_(0),
        background_brush_(QColor(0x0f, 0x43, 0x73)) {
    rainbowtype = rbtype;
@@ -412,7 +412,7 @@ index 7cb0b44c2..25bfb843d 100644
    cat_dash_[1] = QPixmap(":/rainbowdash.png");
    memset(history_, 0, sizeof(history_));
  
-@@ -193,8 +193,8 @@ void Rainbow::RainbowAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s,
+@@ -193,8 +193,8 @@ void Rainbow::RainbowAnalyzer::analyze(Q
    // Draw the buffer on to the widget
    p.drawPixmap(0, 0, buffer_[current_buffer_], x_offset_, 0, 0, 0);
  
@@ -480,7 +480,7 @@ diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
 index fe106e2b7..54defd7fd 100644
 --- a/src/core/utilities.cpp
 +++ b/src/core/utilities.cpp
-@@ -393,9 +393,6 @@ QString GetConfigPath(ConfigPath config) {
+@@ -391,9 +391,6 @@ QString GetConfigPath(ConfigPath config)
        return QDir::homePath();
  #endif
  
@@ -524,7 +524,7 @@ index a04cd923a..c982fd8f4 100644
  
  QString AlbumCoverLoader::ImageCacheDir() {
    return Utilities::GetConfigPath(Utilities::Path_AlbumCovers);
-@@ -179,29 +175,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
+@@ -179,29 +175,6 @@ AlbumCoverLoader::TryLoadResult AlbumCov
      remote_tasks_.insert(reply, task);
      return TryLoadResult(true, false, QImage());
    }
@@ -554,7 +554,7 @@ index a04cd923a..c982fd8f4 100644
    else if (filename.isEmpty()) {
      // Avoid "QFSFileEngine::open: No file name specified" messages if we know that the filename is empty
      return TryLoadResult(false, false, task.options.default_output_image_);
-@@ -213,18 +186,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
+@@ -213,18 +186,6 @@ AlbumCoverLoader::TryLoadResult AlbumCov
        image.isNull() ? task.options.default_output_image_ : image);
  }
  
@@ -577,7 +577,7 @@ diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h
 index c5fae6b4c..ff68c6cf1 100644
 --- a/src/covers/albumcoverloader.h
 +++ b/src/covers/albumcoverloader.h
-@@ -67,9 +67,6 @@ class AlbumCoverLoader : public QObject {
+@@ -67,9 +67,6 @@ class AlbumCoverLoader : public QObject
   protected slots:
    void ProcessTasks();
    void RemoteFetchFinished(QNetworkReply* reply);
@@ -587,7 +587,7 @@ index c5fae6b4c..ff68c6cf1 100644
  
   protected:
    enum State { State_TryingManual, State_TryingAuto, };
-@@ -106,13 +103,10 @@ class AlbumCoverLoader : public QObject {
+@@ -106,13 +103,10 @@ class AlbumCoverLoader : public QObject
    QMutex mutex_;
    QQueue<Task> tasks_;
    QMap<QNetworkReply*, Task> remote_tasks_;
@@ -616,19 +616,26 @@ index f6094c41f..c838ab6dc 100644
  
  const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
  const int GstEnginePipeline::kFaderFudgeMsec = 2000;
-@@ -155,38 +151,6 @@ bool GstEnginePipeline::ReplaceDecodeBin(GstElement* new_bin) {
- bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
-   GstElement* new_bin = nullptr;
+@@ -159,45 +155,6 @@ bool GstEnginePipeline::ReplaceDecodeBin
  
+ GstElement* GstEnginePipeline::CreateDecodeBinFromUrl(const QUrl& url) {
+   GstElement* new_bin = nullptr;
 -#ifdef HAVE_SPOTIFY
 -  if (url.scheme() == "spotify") {
 -    new_bin = gst_bin_new("spotify_bin");
+-    if (!new_bin) return nullptr;
 -
 -    // Create elements
 -    GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
--    if (!src) return false;
+-    if (!src) {
+-      gst_object_unref(GST_OBJECT(new_bin));
+-      return nullptr;
+-    }
 -    GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
--    if (!gdp) return false;
+-    if (!gdp) {
+-      gst_object_unref(GST_OBJECT(new_bin));
+-      return nullptr;
+-    }
 -
 -    // Pick a port number
 -    const int port = Utilities::PickUnusedPort();
@@ -655,7 +662,7 @@ index f6094c41f..c838ab6dc 100644
      QByteArray uri;
      if (url.scheme() == "cdda") {
        QString str = url.toString();
-@@ -203,9 +167,6 @@ bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
+@@ -214,9 +171,6 @@ GstElement* GstEnginePipeline::CreateDec
      CHECKED_GCONNECT(G_OBJECT(new_bin), "pad-added", &NewPadCallback, this);
      CHECKED_GCONNECT(G_OBJECT(new_bin), "notify::source", &SourceSetupCallback,
                       this);
@@ -663,9 +670,9 @@ index f6094c41f..c838ab6dc 100644
 -  }
 -#endif
  
-   return ReplaceDecodeBin(new_bin);
+   return new_bin;
  }
-@@ -959,14 +920,7 @@ void GstEnginePipeline::SourceDrainedCallback(GstURIDecodeBin* bin,
+@@ -980,14 +934,7 @@ void GstEnginePipeline::SourceDrainedCal
                                                gpointer self) {
    GstEnginePipeline* instance = reinterpret_cast<GstEnginePipeline*>(self);
  
@@ -681,7 +688,7 @@ index f6094c41f..c838ab6dc 100644
      instance->TransitionToNext();
    }
  }
-@@ -1058,26 +1012,6 @@ GstState GstEnginePipeline::state() const {
+@@ -1083,26 +1030,6 @@ GstState GstEnginePipeline::state() cons
  }
  
  QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(GstState state) {
@@ -722,7 +729,7 @@ index 756d48073..ab3f8e4fe 100644
  
  using smart_playlists::Generator;
  using smart_playlists::GeneratorMimeData;
-@@ -94,9 +91,6 @@ InternetModel::InternetModel(Application* app, QObject* parent)
+@@ -94,9 +91,6 @@ InternetModel::InternetModel(Application
    AddService(new RadioTunesService(app, this));
    AddService(new SomaFMService(app, this));
    AddService(new IntergalacticFMService(app, this));
@@ -736,7 +743,7 @@ diff --git a/src/main.cpp b/src/main.cpp
 index ecf47b9d4..8b8143f4a 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -145,8 +145,6 @@ void SetEnv(const char* key, const QString& value) {
+@@ -145,8 +145,6 @@ void SetEnv(const char* key, const QStri
  #endif
  }
  
@@ -762,7 +769,7 @@ diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates
 index daf896e73..d74b74a56 100644
 --- a/src/playlist/playlistdelegates.cpp
 +++ b/src/playlist/playlistdelegates.cpp
-@@ -456,9 +456,7 @@ QPixmap SongSourceDelegate::LookupPixmap(const QUrl& url,
+@@ -458,9 +458,7 @@ QPixmap SongSourceDelegate::LookupPixmap
    if (handler) {
      icon = handler->icon();
    } else {
@@ -828,7 +835,7 @@ index 354187ade..80f2820e7 100644
  #include <QAbstractButton>
  #include <QDesktopWidget>
  #include <QPainter>
-@@ -177,10 +173,6 @@ SettingsDialog::SettingsDialog(Application* app, BackgroundStreams* streams,
+@@ -177,10 +173,6 @@ SettingsDialog::SettingsDialog(Applicati
    AddPage(Page_Skydrive, new SkydriveSettingsPage(this), providers);
  #endif