[arch-commits] Commit in clementine/trunk (PKGBUILD clementine-cryptopp6.patch)

[Baptiste Jonglez]

    Date: Monday, January 29, 2018 @ 22:49:20
  Author: zorun
Revision: 287896

clementine: fix build with crypto++ 6.0.0

Added:
  clementine/trunk/clementine-cryptopp6.patch
Modified:
  clementine/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   10 +++++++---
 clementine-cryptopp6.patch |   25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-29 22:29:00 UTC (rev 287895)
+++ PKGBUILD	2018-01-29 22:49:20 UTC (rev 287896)
@@ -6,7 +6,7 @@
 
 pkgname=clementine
 pkgver=1.3.1
-pkgrel=12
+pkgrel=13
 pkgdesc='A modern music player and library organizer'
 url='http://www.clementine-player.org/'
 license=('GPL')
@@ -25,11 +25,13 @@
 source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
         'clementine-gcc6.patch'
         'add-missing-functional-includes-5630.patch'
-        'clementine-1.3.1-chromaprint-1.4.0.patch')
+        'clementine-1.3.1-chromaprint-1.4.0.patch'
+        'clementine-cryptopp6.patch')
 sha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c'
             '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee'
             '213a1c2eb3f3c1d2904ed855ad851c10705d04cfa20b36b843b60003469fdc1a'
-            '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0')
+            '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0'
+            'e9c09dca76ed8fae2ecb089571396c9293f546871fb2f27cc37010dd5cba9e46')
 
 prepare() {
   cd Clementine-${pkgver}
@@ -40,6 +42,8 @@
   patch -p1 -i ../add-missing-functional-includes-5630.patch
   # Fix build with chromaprint 1.4.0
   patch -p1 -i ../clementine-1.3.1-chromaprint-1.4.0.patch
+  # Fix build with crypto++ 6.0.0 due to https://github.com/weidai11/cryptopp/issues/442
+  patch -p1 -i ../clementine-cryptopp6.patch
 
   if [[ -d build ]]; then
     rm -rf build

Added: clementine-cryptopp6.patch
===================================================================
--- clementine-cryptopp6.patch	                        (rev 0)
+++ clementine-cryptopp6.patch	2018-01-29 22:49:20 UTC (rev 287896)
@@ -0,0 +1,25 @@
+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"