From edc3e434486c95e7ee8e227def485cc9e068f377 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 21 Jul 2018 18:30:25 +0200
Subject: 20180721.2 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 audio/clementine/clementine.SlackBuild   |  3 ++
 audio/clementine/clementine.info         |  2 +-
 audio/clementine/functional-header.patch | 48 ++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 audio/clementine/functional-header.patch

(limited to 'audio/clementine')

diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild
index d5e99369ae..d6675b8c85 100644
--- a/audio/clementine/clementine.SlackBuild
+++ b/audio/clementine/clementine.SlackBuild
@@ -78,6 +78,8 @@ patch -p1 < $CWD/sqlite.patch
 # https://github.com/clementine-player/Clementine/commit/ded312685735fc266d4154d355286eeb86db3bcd
 patch -p1 < $CWD/chromaprint-1.4.patch
 
+patch -p1 < $CWD/functional-header.patch
+
 mkdir build
 cd build
   cmake \
@@ -86,6 +88,7 @@ cd build
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DLIB_SUFFIX=${LIBDIRSUFFIX} \
 	-DMAN_INSTALL_DIR=/usr/man \
+        -DUSE_SYSTEM_PROJECTM=1 \
 	-DCMAKE_BUILD_TYPE=Release \
 	..
   make all CFLAGS="-fPIC" PMFLAGS="-DNEWBUFFER"
diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info
index 1f92d726a1..184e07d412 100644
--- a/audio/clementine/clementine.info
+++ b/audio/clementine/clementine.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz"
 MD5SUM="04ce1c102841282e620d4caae2a897a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="chromaprint cryptopp libechonest protobuf"
+REQUIRES="chromaprint cryptopp libechonest projectM protobuf"
 MAINTAINER="David Woodfall"
 EMAIL="dave@dawoodfall.net"
diff --git a/audio/clementine/functional-header.patch b/audio/clementine/functional-header.patch
new file mode 100644
index 0000000000..f41147d0ff
--- /dev/null
+++ b/audio/clementine/functional-header.patch
@@ -0,0 +1,48 @@
+From a2f7d018c7bdee96d4cefd5a1ec0c4f710fea226 Mon Sep 17 00:00:00 2001
+From: Morris <hafnermorris@gmail.com>
+Date: Sun, 12 Feb 2017 23:41:43 +0100
+Subject: [PATCH] Add missing <functional> includes
+
+---
+ src/core/mergedproxymodel.cpp | 1 +
+ src/devices/giolister.cpp     | 1 +
+ src/library/groupbydialog.cpp | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
+index 56217f6..8c210d3 100644
+--- a/src/core/mergedproxymodel.cpp
++++ b/src/core/mergedproxymodel.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QStringList>
+ 
++#include <functional>
+ #include <limits>
+ 
+ // boost::multi_index still relies on these being in the global namespace.
+diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
+index aa3bddb..5f63ef2 100644
+--- a/src/devices/giolister.cpp
++++ b/src/devices/giolister.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "config.h"
+ 
++#include <functional>
+ #include <memory>
+ 
+ #include <QFile>
+diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
+index 5efdc9f..e5f711b 100644
+--- a/src/library/groupbydialog.cpp
++++ b/src/library/groupbydialog.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include <QPushButton>
+ 
++#include <functional>
++
+ // boost::multi_index still relies on these being in the global namespace.
+ using std::placeholders::_1;
+ using std::placeholders::_2;
-- 
cgit v1.2.3