From 56fff49ad48b4141c3b097d1d5a64a936a097793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 4 Aug 2020 21:54:18 +0700 Subject: [PATCH 1/2] clementine: build with liblastfm-qt5 While we're at it, drop the build_options, it doesn't make sense for the build options. --- srcpkgs/clementine/patches/QPainterPath.patch | 36 +++++++++++++++++++ srcpkgs/clementine/template | 18 +++++----- 2 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/clementine/patches/QPainterPath.patch 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 + #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/template b/srcpkgs/clementine/template index 1ad02f3dee1..845425347d6 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,16 +1,16 @@ # 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 libechonest-devel liblastfm-qt5-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" @@ -23,16 +23,15 @@ distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.ta checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a patch_args="-Np1" -build_options="spotify" case "$XBPS_TARGET_MACHINE" in x86_64 | i686 | armv7l) - build_options_default="spotify";; - *) - build_options_default="";; + makedepends+=" libspotify-devel" + subpackages="clementine-spotify" + ;; + *) subpackages=" " ;; 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 @@ -42,12 +41,13 @@ pre_configure() { } 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 From 6f6e90fd49329f5b9f5ba9d4609e4bd1e1d947ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 5 Aug 2020 08:51:22 +0700 Subject: [PATCH 2/2] liblastfm: drop package --- srcpkgs/liblastfm-devel | 1 - srcpkgs/liblastfm/template | 25 ------------------------- 2 files changed, 26 deletions(-) delete mode 120000 srcpkgs/liblastfm-devel delete mode 100644 srcpkgs/liblastfm/template diff --git a/srcpkgs/liblastfm-devel b/srcpkgs/liblastfm-devel deleted file mode 120000 index 78808ea0a12..00000000000 --- a/srcpkgs/liblastfm-devel +++ /dev/null @@ -1 +0,0 @@ -liblastfm \ No newline at end of file diff --git a/srcpkgs/liblastfm/template b/srcpkgs/liblastfm/template deleted file mode 100644 index d387b3fed76..00000000000 --- a/srcpkgs/liblastfm/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'liblastfm' -pkgname=liblastfm -version=1.0.9 -revision=2 -build_style=cmake -makedepends="qt-devel libsamplerate-devel fftw-devel" -short_desc="A Qt4 C++ library for the Last.fm webservices" -maintainer="Logen K " -license="GPL-3.0-or-later" -homepage="https://github.com/lastfm/liblastfm" -distfiles="https://github.com/lastfm/${pkgname}/archive/${version}.tar.gz" -checksum=5276b5fe00932479ce6fe370ba3213f3ab842d70a7d55e4bead6e26738425f7b - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel" -fi - -liblastfm-devel_package() { - depends="liblastfm>=${version}_${revision} $makedepends" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - } -}