diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch deleted file mode 100644 index 271b8c1d724..00000000000 --- a/srcpkgs/clementine/patches/QPainterPath.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - #include -+#include - - 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 - #include - #include -+#include - #include - #include - #include -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 - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch index c976dbb42d7..ad39814196e 100644 --- a/srcpkgs/clementine/patches/musl.patch +++ b/srcpkgs/clementine/patches/musl.patch @@ -1,15 +1,17 @@ ---- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200 -+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200 +diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp +index 8012c0c..ce77c77 100644 +--- ext/libclementine-common/core/logging.cpp ++++ ext/libclementine-common/core/logging.cpp @@ -21,7 +21,7 @@ - #include - #include + + #include -#ifdef Q_OS_UNIX +#if defined Q_OS_UNIX && defined __GLIBC__ #include #endif -@@ -249,7 +249,7 @@ +@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) { } void DumpStackTrace() { diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 04c0cf55f67..f10318f8809 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,11 +1,11 @@ # Template file for 'clementine' pkgname=clementine -version=1.3.1 -revision=27 -_commit=75f18dab23f0842713a4200a7e362efd51b12e31 -wrksrc="Clementine-${_commit}" +_fullver=1.4.0rc1-343-gb49afcc5b +version=${_fullver%%-*} +wrksrc=${pkgname}-${_fullver} +revision=1 build_style=cmake -configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF" +configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON" 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 @@ -13,15 +13,14 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-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 liblastfm-qt5-devel libechonest-qt5-devel" + qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel projectM-devel" depends="desktop-file-utils" short_desc="Modern music player and library organizer" maintainer="Andrea Brancaleoni " 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" +distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz" +checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397 build_options="spotify" case "$XBPS_TARGET_MACHINE" in