From 8e5d0a8206845ace0566c8c245b58412fe50e8dc Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Fri, 1 Mar 2019 12:03:22 -0300
Subject: [PATCH] clementine: rebuild against protobuf-3.7.0

[ci skip]

Co-authored-by: Rasmus Thomsen <oss@cogitri.dev>
---
 srcpkgs/clementine/patches/protobuf-370.patch | 82 +++++++++++++++++++
 srcpkgs/clementine/template                   | 12 +--
 2 files changed, 88 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/clementine/patches/protobuf-370.patch

diff --git a/srcpkgs/clementine/patches/protobuf-370.patch b/srcpkgs/clementine/patches/protobuf-370.patch
new file mode 100644
index 00000000000..00617da94cd
--- /dev/null
+++ b/srcpkgs/clementine/patches/protobuf-370.patch
@@ -0,0 +1,82 @@
+--- a/src/internet/lastfm/lastfmcompat.cpp
++++ b/src/internet/lastfm/lastfmcompat.cpp
+@@ -68,13 +68,13 @@ bool ParseQuery(const QByteArray& data, XmlQuery* query,
+       return false;
+     }
+ #endif  // Q_OS_WIN32
+-  } catch (lastfm::ws::ParseError e) {
++  } catch (lastfm::ws::ParseError &e) {
+     qLog(Error) << "Last.fm parse error: " << e.enumValue();
+     if (connection_problems) {
+       *connection_problems = e.enumValue() == lastfm::ws::MalformedResponse;
+     }
+     return false;
+-  } catch (std::runtime_error& e) {
++  }  (std::runtime_error& e) {
+     qLog(Error) << e.what();
+     return false;
+   }
+--- a/src/internet/spotify/spotifyblobdownloader.cpp
++++ b/src/internet/spotify/spotifyblobdownloader.cpp
+@@ -216,7 +216,7 @@ bool SpotifyBlobDownloader::CheckSignature(
+         return false;
+       }
+     }
+-  } catch (std::exception e) {
++  } catch (std::exception &e) {
+     // This should only happen if we fail to parse our own key.
+     qLog(Debug) << "Verifying spotify blob signature failed:" << e.what();
+     return false;
+--- a/src/songinfo/echonestbiographies.cpp
++++ b/src/songinfo/echonestbiographies.cpp
+@@ -66,7 +66,7 @@ void EchoNestBiographies::RequestFinished() {
+   try {
+     request->artist_->parseProfile(reply);
+   }
+-  catch (Echonest::ParseError e) {
++  catch (Echonest::ParseError &e) {
+     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+                   << e.what();
+   }
+--- a/src/songinfo/echonestimages.cpp
++++ b/src/songinfo/echonestimages.cpp
+@@ -68,7 +68,7 @@ void EchoNestImages::RequestFinished(QNetworkReply* reply, int id,
+   reply->deleteLater();
+   try {
+     artist.parseProfile(reply);
+-  } catch (Echonest::ParseError e) {
++  } catch (Echonest::ParseError &e) {
+     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+                   << e.what();
+   }
+@@ -94,7 +94,7 @@ void EchoNestImages::IdsFound(QNetworkReply* reply, int request_id) {
+         DoSpotifyImageRequest(id.foreign_id, request_id);
+       }
+     }
+-  } catch (Echonest::ParseError e) {
++  } catch (Echonest::ParseError &e) {
+     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+                   << e.what();
+   }
+--- a/src/songinfo/echonestsimilarartists.cpp
++++ b/src/songinfo/echonestsimilarartists.cpp
+@@ -47,7 +47,7 @@ void EchoNestSimilarArtists::RequestFinished() {
+   try {
+     artists = Echonest::Artist::parseSimilar(reply);
+   }
+-  catch (Echonest::ParseError e) {
++  catch (Echonest::ParseError &e) {
+     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+                   << e.what();
+   }
+--- a/src/songinfo/echonesttags.cpp
++++ b/src/songinfo/echonesttags.cpp
+@@ -51,7 +51,7 @@ void EchoNestTags::RequestFinished() {
+   try {
+     request->artist_->parseProfile(reply);
+   }
+-  catch (Echonest::ParseError e) {
++  catch (Echonest::ParseError &e) {
+     qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+                   << e.what();
+   }
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 915d9950a53..6ed50eeae71 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,24 +1,24 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.3.1
-revision=16
-patch_args="-Np1"
+revision=17
+wrksrc="Clementine-${version}"
 build_style=cmake
-hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf-c"
+hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf"
 makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel
  qt-webkit-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel
  libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel
  taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libechonest-devel
- libgpod-devel"
+ libgpod-devel protobuf-devel"
 depends="desktop-file-utils"
-short_desc="A modern music player and library organizer"
+short_desc="Modern music player and library organizer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="https://www.clementine-player.org/"
-wrksrc="Clementine-${version}"
 distfiles="https://github.com/clementine-player/Clementine/archive/${version}.tar.gz"
 checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
 
+patch_args="-Np1"
 build_options="spotify"
 
 case "$XBPS_TARGET_MACHINE" in