From cd021e1dc7ebaa5cfbfc896372370ce684552ffe Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 Nov 2017 22:09:59 +0100 Subject: [PATCH] clementine: enable ipod support; unbreak compilation with gcc-7. --- ...add-missing-functional-includes-5630.patch | 51 +++++++++++++++++++ srcpkgs/clementine/template | 8 ++- 2 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch diff --git a/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch b/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch new file mode 100644 index 00000000000..0355eefca7c --- /dev/null +++ b/srcpkgs/clementine/patches/add-missing-functional-includes-5630.patch @@ -0,0 +1,51 @@ +From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001 +From: Morris Hafner +Date: Mon, 13 Feb 2017 17:46:46 +0100 +Subject: [PATCH] Add missing includes (#5630) + +--- + 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 56217f6fd..8c210d391 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + // 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 aa3bddb34..5f63ef248 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include + #include + + #include +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f36..e5f711b34 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include + ++#include ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; +-- +2.13.4 + diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 392b3b28c81..bee9cafe022 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -4,7 +4,7 @@ version=1.3.1 revision=10 patch_args="-Np1" build_style=cmake -hostmakedepends="sparsehash pkg-config" +hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf-c" 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 @@ -19,10 +19,6 @@ wrksrc="Clementine-$version" distfiles="https://github.com/clementine-player/Clementine/archive/$version.tar.gz" checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel protobuf-c" -fi - build_options="spotify" case "$XBPS_TARGET_MACHINE" in @@ -35,6 +31,8 @@ esac subpackages="$(vopt_if spotify clementine-spotify)" pre_configure() { + sed -i 's|-Wno-unused-private-field||g' src/CMakeLists.txt ext/clementine-spotifyblob/CMakeLists.txt + sed -i 's|-Wno-unknown-warning-option||g' src/CMakeLists.txt ext/clementine-spotifyblob/CMakeLists.txt sed -i 's|AMAZON_CLOUD_DRIVE OFF|AMAZON_CLOUD_DRIVE ON|g' CMakeLists.txt sed -i 's;if (fs == NULL);if (!fs);' 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp }