clementine: update to 1.4.0rc1-873-g3471134d5.

srcpkgs/clementine-spotify

@@ -1 +0,0 @@
-clementine

srcpkgs/clementine/patches/gcc11.patch

@@ -1,70 +0,0 @@
-From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
-Date: Wed, 16 Dec 2020 20:03:26 +0100
-Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was causing compilation failures, static assertion failed, with GCC 11.
-
-Fix #6865
-
-Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
----
- ext/clementine-spotifyblob/CMakeLists.txt | 2 +-
- ext/clementine-tagreader/CMakeLists.txt   | 2 +-
- src/CMakeLists.txt                        | 2 +-
- tests/CMakeLists.txt                      | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt
-index e5342ee5b3..6fd551d572 100644
---- a/ext/clementine-spotifyblob/CMakeLists.txt
-+++ b/ext/clementine-spotifyblob/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
- include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
- include_directories(${CMAKE_SOURCE_DIR}/src)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
- 
- link_directories(${SPOTIFY_LIBRARY_DIRS})
- 
-diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt
-index 855e390cfe..a48b014504 100644
---- a/ext/clementine-tagreader/CMakeLists.txt
-+++ b/ext/clementine-tagreader/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
- include_directories(${CMAKE_SOURCE_DIR}/src)
- include_directories(${CMAKE_BINARY_DIR}/src)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- 
- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 627b2e7cb9..0bbc775ba8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,6 +1,6 @@
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
- 
- option(BUILD_WERROR "Build with -Werror" ON)
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 4474e7be51..ff571fc199 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 2.8.11)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
- 
- if(USE_SYSTEM_GMOCK)
-   include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})

srcpkgs/clementine/patches/musl.patch

@@ -1,22 +0,0 @@
-diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
-index 8012c0c..ce77c77 100644
---- a/ext/libclementine-common/core/logging.cpp
-+++ b/ext/libclementine-common/core/logging.cpp
-@@ -21,7 +21,7 @@
- #include <cxxabi.h>
- 
- #include <QtGlobal>
--#ifdef Q_OS_UNIX
-+#if defined Q_OS_UNIX && defined __GLIBC__
- #include <execinfo.h>
- #endif
- 
-@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
- }
- 
- void DumpStackTrace() {
--#ifdef Q_OS_UNIX
-+#if defined Q_OS_UNIX && defined __GLIBC__
-   void* callstack[128];
-   int callstack_size =
-       backtrace(reinterpret_cast<void**>(&callstack), sizeof(callstack));

srcpkgs/clementine/template

@@ -1,49 +1,27 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.4.0rc1
-revision=9
+revision=10
-_fullver=$version-343-gb49afcc5b
+_fullver=${version}-873-g3471134d5
 build_style=cmake
-configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON"
+configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
+ -DFORCE_GIT_REVISION=${_fullver}"
 hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
 makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
  qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
  libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel
- taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
+ taglib-devel crypto++-devel libgpod-devel libmygpo-qt-devel
- libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
+ qt5-x11extras-devel qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
+ qt5-plugin-tds qt5-plugin-odbc qt5-tools-devel liblastfm-qt5-devel
- qt5-tools-devel liblastfm-qt5-devel projectM-devel"
+ projectM-devel"
 depends="desktop-file-utils"
 short_desc="Modern music player and library organizer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://www.clementine-player.org/"
-distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
+distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
+checksum=e046fb76cca7f7c69e61fe445e828146ab44f10f2ff7747b97adc947500a56b6
-build_options="spotify"
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64 | i686 | armv7l)
-		build_options_default="spotify";;
-	*)
-		if [ "$build_option_spotify" ]; then
-			broken="no spotify blob"
-		fi
-		;;
-esac
-
-subpackages="$(vopt_if spotify clementine-spotify)"
 
 post_install() {
 	rm -rf $DESTDIR/builddir
 }
-
-clementine-spotify_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - spotify extension"
-	license="Apache-2.0"
-	repository="nonfree"
-	pkg_install() {
-		vmove usr/bin/clementine-spotifyblob
-	}
-}