clementine: 1.3.1 -> 1.3.1.r771.75f18dab2

4 files changed, 17 insertions, 82 deletions

diff --git a/clementine/.footprint b/clementine/.footprint
index 0b648960a..3fa16cb78 100644
--- a/clementine/.footprint
+++ b/clementine/.footprint
@@ -3,8 +3,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/clementine
 -rwxr-xr-x	root/root	usr/bin/clementine-tagreader
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/appdata/
--rw-r--r--	root/root	usr/share/appdata/clementine.appdata.xml
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/clementine.desktop
 drwxr-xr-x	root/root	usr/share/clementine/
@@ -591,9 +589,10 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/clementine.svg
-drwxr-xr-x	root/root	usr/share/kde4/
-drwxr-xr-x	root/root	usr/share/kde4/services/
--rw-r--r--	root/root	usr/share/kde4/services/clementine-feed.protocol
--rw-r--r--	root/root	usr/share/kde4/services/clementine-itms.protocol
--rw-r--r--	root/root	usr/share/kde4/services/clementine-itpc.protocol
--rw-r--r--	root/root	usr/share/kde4/services/clementine-zune.protocol
+drwxr-xr-x	root/root	usr/share/kservices5/
+-rw-r--r--	root/root	usr/share/kservices5/clementine-feed.protocol
+-rw-r--r--	root/root	usr/share/kservices5/clementine-itms.protocol
+-rw-r--r--	root/root	usr/share/kservices5/clementine-itpc.protocol
+-rw-r--r--	root/root	usr/share/kservices5/clementine-zune.protocol
+drwxr-xr-x	root/root	usr/share/metainfo/
+-rw-r--r--	root/root	usr/share/metainfo/clementine.appdata.xml
diff --git a/clementine/.signature b/clementine/.signature
index b8df75d5b..17067d896 100644
--- a/clementine/.signature
+++ b/clementine/.signature
@@ -1,11 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zNaD4Jnb42XpS7EiU+5XcjaMp6SG6uLDMDlw0eLsNg4U/wstquJOrieOLPss+SPCfxiYbdKVR0KXp1Reqd+AQ4=
-SHA256 (Pkgfile) = 1a7f75b509368a94ea67c2601e36ff4822eaac77581572eaeaafd7d2dc353d6a
-SHA256 (.footprint) = 3f1bad4230e6fa52cf3322aee039d5ce640d26e8fbe4aac8df657f1b7ad8938b
-SHA256 (1.3.1.tar.gz) = f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
-SHA256 (f371fcb89f1441b50eab5015fc1bdcbd630d19ee.patch) = a5ada5c81b6e1540d7c87014f08f6fbeb4eec9f5ad3ebf2305bada9e9a76ac9d
-SHA256 (8a6cc8b5069265e1e92e22def985e22c5955e503.patch) = 77e32aae6f035523d5cfb8adb45cb0857ebed751b7fcd1f250a2972c79f6282e
-SHA256 (75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch) = d4dbd7f09da7a554f86237476b96e3ca097117b7ab2acd706088c72203d8b64f
-SHA256 (ddfa5e63f1ef0e243a007efbe576fceb9b2442e8.patch) = 9c02acd0a2b70ce8d0b6574161df692fc08c9e9c3061a4a7b78be7805b279dc7
+RWSagIOpLGJF37b3D+PTdECNhPU1z1cIVYLHqeyzKknEwlwZxCgLxdhz4BgGTuRz+BedKyyMhaQ/H6RNQHZHT5bLdGCcBZ3C4wc=
+SHA256 (Pkgfile) = 4f5f25aaebc24f1afaa5db367b1536be133fdd12248a1f4f0e6635ec6f9a8c3a
+SHA256 (.footprint) = 07474b487f0cefadeb11340667c106af2ef76ecff104ffc38691f945c1d9ec66
+SHA256 (75f18dab23f0842713a4200a7e362efd51b12e31.zip) = 87a79a39430f3144dedbc5fd8136b815b99665c25792496f3c7e13ff459c89c8
 SHA256 (clementine-gcc6.patch) = 05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee
-SHA256 (clementine-1.3.1-chromaprint-1.4.0.patch) = 4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0
diff --git a/clementine/Pkgfile b/clementine/Pkgfile
index dbdef917f..788315ed2 100644
--- a/clementine/Pkgfile
+++ b/clementine/Pkgfile
@@ -2,36 +2,18 @@
 # URL: http://www.clementine-player.org/
 # Packager: Chris Farrell, timcowchip at gmail dot com
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: boost crypto++ glew glu gst-plugins-bad gst-plugins-good gst-plugins-ugly libechonest protobuf
+# Depends on: boost crypto++ glew gst-plugins-bad gst-plugins-good gst-plugins-ugly protobuf qt5
 
 name=clementine
-version=1.3.1
-release=3
-source=(https://github.com/clementine-player/Clementine/archive/$version.tar.gz
-	https://github.com/clementine-player/Clementine/pull/5974/commits/f371fcb89f1441b50eab5015fc1bdcbd630d19ee.patch
-	https://github.com/clementine-player/Clementine/commit/8a6cc8b5069265e1e92e22def985e22c5955e503.patch
-	https://github.com/clementine-player/Clementine/commit/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch
-	https://github.com/clementine-player/Clementine/commit/ddfa5e63f1ef0e243a007efbe576fceb9b2442e8.patch
-	clementine-gcc6.patch
-	clementine-1.3.1-chromaprint-1.4.0.patch)
+version=1.3.1.r771.75f18dab2
+release=1
+source=(https://github.com/clementine-player/Clementine/archive/75f18dab23f0842713a4200a7e362efd51b12e31.zip
+	clementine-gcc6.patch)
 
 build() {
-	cd Clementine-$version
+	cd Clementine-75f18dab23f0842713a4200a7e362efd51b12e31
 
 	patch -p1 -i $SRC/clementine-gcc6.patch
-	patch -p1 -i $SRC/clementine-1.3.1-chromaprint-1.4.0.patch
-
-	# [PATCH] Fix compilation with crypto++ >= 6.0.0
-	patch -p1 -i $SRC/f371fcb89f1441b50eab5015fc1bdcbd630d19ee.patch
-
-	# [PATCH] Add missing <functional> includes (#5630)
-	patch -p1 -i $SRC/8a6cc8b5069265e1e92e22def985e22c5955e503.patch
-
-	# [PATCH 1/3] disconnect GVolumeMonitor signals from GioLister before destroying it fixes #5369
-	patch -p1 -i $SRC/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch
-
-	# [PATCH] Fix channels loading for DI.fm services after API domain changes (#6023)
-	patch -p1 -i $SRC/ddfa5e63f1ef0e243a007efbe576fceb9b2442e8.patch
 
 	install -d build
 	cd build
diff --git a/clementine/clementine-1.3.1-chromaprint-1.4.0.patch b/clementine/clementine-1.3.1-chromaprint-1.4.0.patch
deleted file mode 100644
index 099704026..000000000
--- a/clementine/clementine-1.3.1-chromaprint-1.4.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.bigard@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);