[arch-commits] Commit in clementine/trunk (3 files)

[Maxime Gauduin]

    Date: Saturday, August 17, 2019 @ 14:19:44
  Author: alucryd
Revision: 499985

upgpkg: clementine 1.3.1.r771.75f18dab2-1

Modified:
  clementine/trunk/PKGBUILD
Deleted:
  clementine/trunk/clementine-chromaprint1.4.0.patch
  clementine/trunk/clementine-cryptopp6.patch

-----------------------------------+
 PKGBUILD                          |    6 ++---
 clementine-chromaprint1.4.0.patch |   41 ------------------------------------
 clementine-cryptopp6.patch        |   25 ---------------------
 3 files changed, 3 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-17 14:19:38 UTC (rev 499984)
+++ PKGBUILD	2019-08-17 14:19:44 UTC (rev 499985)
@@ -4,8 +4,8 @@
 # Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
 
 pkgname=clementine
-pkgver=1.3.1.r702.3b76fa627
-pkgrel=2
+pkgver=1.3.1.r771.75f18dab2
+pkgrel=1
 pkgdesc='A modern music player and library organizer'
 url=https://www.clementine-player.org/
 license=(GPL)
@@ -49,7 +49,7 @@
   'gvfs: Various devices support'
 )
 source=(
-  git+https://github.com/clementine-player/Clementine.git#commit=3b76fa62752f25b445ee2a71f02c0c9d7581735a
+  git+https://github.com/clementine-player/Clementine.git#commit=75f18dab23f0842713a4200a7e362efd51b12e31
   clementine-gcc6.patch
 )
 sha256sums=(

Deleted: clementine-chromaprint1.4.0.patch
===================================================================
--- clementine-chromaprint1.4.0.patch	2019-08-17 14:19:38 UTC (rev 499984)
+++ clementine-chromaprint1.4.0.patch	2019-08-17 14:19:44 UTC (rev 499985)
@@ -1,41 +0,0 @@
-From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.bigard at gmail.com>
-Date: Thu, 8 Dec 2016 23:12:17 +0100
-Subject: [PATCH] Add compatibility with chromaprint >= 1.4
-
----
- src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
-index 9579b62ae..c7ad99e2e 100644
---- a/src/musicbrainz/chromaprinter.cpp
-+++ b/src/musicbrainz/chromaprinter.cpp
-@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
-   ChromaprintContext* chromaprint =
-       chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
-   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
--  chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
-+  chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
-                    data.size() / 2);
-   chromaprint_finish(chromaprint);
- 
--  void* fprint = nullptr;
-   int size = 0;
-+
-+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
-+  u_int32_t *fprint = nullptr;
-+  char *encoded = nullptr;
-+#else
-+  void *fprint = nullptr;
-+  void *encoded = nullptr;
-+#endif
-+
-   int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
-+
-   QByteArray fingerprint;
-   if (ret == 1) {
--    void* encoded = nullptr;
-     int encoded_size = 0;
-     chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
-                                    &encoded, &encoded_size, 1);

Deleted: clementine-cryptopp6.patch
===================================================================
--- clementine-cryptopp6.patch	2019-08-17 14:19:38 UTC (rev 499984)
+++ clementine-cryptopp6.patch	2019-08-17 14:19:44 UTC (rev 499985)
@@ -1,25 +0,0 @@
-diff --git a/src/internet/spotify/spotifyblobdownloader.cpp b/src/internet/spotify/spotifyblobdownloader.cpp
-index e34577f5d..045aeeb8a 100644
---- a/src/internet/spotify/spotifyblobdownloader.cpp
-+++ b/src/internet/spotify/spotifyblobdownloader.cpp
-@@ -189,7 +189,7 @@ bool SpotifyBlobDownloader::CheckSignature(
- 
-   try {
-     CryptoPP::ByteQueue bytes;
--    bytes.Put(reinterpret_cast<const byte*>(public_key_data.constData()),
-+    bytes.Put(reinterpret_cast<const CryptoPP::byte*>(public_key_data.constData()),
-               public_key_data.size());
-     bytes.MessageEnd();
- 
-@@ -204,9 +204,9 @@ bool SpotifyBlobDownloader::CheckSignature(
-       actual_filename.remove(kSignatureSuffix);
- 
-       const bool result = verifier.VerifyMessage(
--          reinterpret_cast<const byte*>(file_data[actual_filename].constData()),
-+          reinterpret_cast<const CryptoPP::byte*>(file_data[actual_filename].constData()),
-           file_data[actual_filename].size(),
--          reinterpret_cast<const byte*>(
-+          reinterpret_cast<const CryptoPP::byte*>(
-               file_data[signature_filename].constData()),
-           file_data[signature_filename].size());
-       qLog(Debug) << "Verifying" << actual_filename << "against"