clementine: 1.4.0rc1 -> 1.4.0rc1-169

clementine/.signature

@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xf8CK49dubDkrvIBHlRorJX018lMUeBMmlWrG0a4F9ISWpnkCKQYPGezfcp6FejfoclVeVomMoNXRfBXDc9Cg8=
-SHA256 (Pkgfile) = 3c76ae71451822e0f79e4aead035b5bb03f4556b09036c4fb1b8a5a9995b1548
+RWSagIOpLGJF3+cWyAEIoGEdBd+CGhEdB9z1ldcxE5n2FBY4pIOY+tliT9De5myAZ+LAuVGUhQfvuhtbkPbTFpI43nR2MH+ZKQ0=
+SHA256 (Pkgfile) = e12f456d8de070f431b697d58632f9432d1ff6fa5e695370a4d3c01b24fd0c5b
 SHA256 (.footprint) = 07474b487f0cefadeb11340667c106af2ef76ecff104ffc38691f945c1d9ec66
-SHA256 (clementine-1.4.0rc1.tar.gz) = ad493a1954594283d41a1575341118e19098463ba5626a37b893d8384e0a1f7b
+SHA256 (clementine-1.4.0rc1-169-g934fd336d.tar.gz) = e6f55ed9c163084ddb6013788b74077e6dae00724458931bbd03d3275f30df84
+SHA256 (clementine-gcc6.patch) = 05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee

clementine/Pkgfile

@@ -5,26 +5,22 @@
 # Depends on: boost crypto++ glew gst-plugins-bad gst-plugins-good gst-plugins-ugly protobuf qt5
 
 name=clementine
-version=1.4.0rc1
+version=1.4.0rc1-169
 release=1
-source=(https://github.com/clementine-player/Clementine/archive/$version/$name-$version.tar.gz)
+source=(https://github.com/clementine-player/Clementine/archive/$version-g934fd336d/$name-$version-g934fd336d.tar.gz
+	clementine-gcc6.patch)
 
 build() {
-	cd Clementine-$version
-
-	install -d build
-	cd build
-
 	# make sure we do not have ccache masquerade directory in PATH
 	# as cmake calls ccache directly, this avoids recursvely
 	# calling ccache and CCACHE_PREFIX
 	PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
 
-	cmake .. \
+	cmake -HClementine-$version-g934fd336d -Bbuild \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE='Release' \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-catch-value"
 
-	make
-	make DESTDIR=$PKG install
+	cmake --build build
+	DESTDIR=$PKG cmake --build build --target install
 }

clementine/clementine-gcc6.patch

@@ -0,0 +1,22 @@
+From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001
+From: Bigard Florian <florian.bigard@gmail.com>
+Date: Mon, 9 May 2016 11:55:34 +0200
+Subject: [PATCH] Fix projectm compilation with GCC 6 (#5371)
+
+---
+ 3rdparty/libprojectm/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
+index e6287f176..0ef785c49 100644
+--- a/3rdparty/libprojectm/CMakeLists.txt
++++ b/3rdparty/libprojectm/CMakeLists.txt
+@@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON)
+ set(DISABLE_NATIVE_PRESETS ON)
+ set(DISABLE_MILKDROP_PRESETS OFF)
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
++
+ if(DISABLE_NATIVE_PRESETS)
+   ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS)
+ endif(DISABLE_NATIVE_PRESETS)