diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch
new file mode 100644
index 00000000000..271b8c1d724
--- /dev/null
+++ b/srcpkgs/clementine/patches/QPainterPath.patch
@@ -0,0 +1,36 @@
+diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
+index 3067f72..c9789d3 100644
+--- a/src/widgets/freespacebar.cpp
++++ b/src/widgets/freespacebar.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QLinearGradient>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ const int FreeSpaceBar::kBarHeight = 20;
+ const int FreeSpaceBar::kBarBorderRadius = 8;
+diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
+index 9d95716..30cef7d 100644
+--- a/src/widgets/osdpretty.cpp
++++ b/src/widgets/osdpretty.cpp
+@@ -26,6 +26,7 @@
+ #include <QLayout>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSettings>
+ #include <QTimer>
+ #include <QTimeLine>
+diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
+index 581a0de..27b81f7 100644
+--- a/src/widgets/sliderwidget.cpp
++++ b/src/widgets/sliderwidget.cpp
+@@ -24,6 +24,7 @@
+ #include <QBrush>
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSize>
+ #include <QTimer>
+ #include <QStyle>
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 1ad02f3dee1..2465b8f4605 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,19 +1,19 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.3.1
-revision=25
+revision=26
 _commit=75f18dab23f0842713a4200a7e362efd51b12e31
 wrksrc="Clementine-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
 hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
-makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel
+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) libechonest-devel
+ taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
  libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
  qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
- qt5-tools-devel"
+ qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel"
 depends="desktop-file-utils"
 short_desc="Modern music player and library organizer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -21,7 +21,6 @@ license="GPL-3.0-or-later"
 homepage="https://www.clementine-player.org/"
 distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
 checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
-
 patch_args="-Np1"
 build_options="spotify"
 
@@ -29,25 +28,22 @@ case "$XBPS_TARGET_MACHINE" in
 	x86_64 | i686 | armv7l)
 		build_options_default="spotify";;
 	*)
-		build_options_default="";;
+		if [ "$build_option_spotify" ]; then
+			broken="no spotify blob"
+		fi
+		;;
 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
-}
-
 post_install() {
-	$(vopt_if spotify rm\ -r\ $DESTDIR/builddir)
+	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