From d943b372d89672da5fb3d6cde6ae9f6c9da153c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Mar 2021 15:28:04 +0700 Subject: [PATCH] mellowplayer: fix build --- srcpkgs/mellowplayer/patches/no-werror.patch | 13 +++++++++++++ srcpkgs/mellowplayer/template | 13 +++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/mellowplayer/patches/no-werror.patch diff --git a/srcpkgs/mellowplayer/patches/no-werror.patch b/srcpkgs/mellowplayer/patches/no-werror.patch new file mode 100644 index 00000000000..7e678453a12 --- /dev/null +++ b/srcpkgs/mellowplayer/patches/no-werror.patch @@ -0,0 +1,13 @@ +Index: MellowPlayer-3.6.6/src/3rdparty/boost/di.hpp +=================================================================== +--- MellowPlayer-3.6.6.orig/src/3rdparty/boost/di.hpp ++++ MellowPlayer-3.6.6/src/3rdparty/boost/di.hpp +@@ -67,7 +67,7 @@ BOOST_DI_CFG_FWD + #pragma clang diagnostic error "-Wundefined-internal" + #pragma clang diagnostic ignored "-Wmissing-field-initializers" + #elif defined(__GCC__) +-#pragma GCC diagnostic error "-Wdeprecated-declarations" ++#pragma GCC diagnostic warning "-Wdeprecated-declarations" + #pragma GCC diagnostic push + #if (__GNUC__ < 6) + #pragma GCC diagnostic error "-Werror" diff --git a/srcpkgs/mellowplayer/template b/srcpkgs/mellowplayer/template index 2f8f13960ca..cfd8a185556 100644 --- a/srcpkgs/mellowplayer/template +++ b/srcpkgs/mellowplayer/template @@ -4,7 +4,7 @@ version=3.6.6 revision=1 wrksrc="MellowPlayer-${version}" build_style=cmake -hostmakedepends="pkg-config qt5-tools qt5-qmake" +hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools" makedepends="qt5-declarative-devel qt5-quickcontrols2-devel qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc @@ -17,11 +17,12 @@ license="GPL-2.0-or-later" homepage="https://colinduquesnoy.gitlab.io/MellowPlayer/" distfiles="https://gitlab.com/ColinDuquesnoy/MellowPlayer/-/archive/${version}/MellowPlayer-${version}.tar.bz2" checksum=17b8b25ca6b3d27b223f8be6ad80186ae5bd17ce762eb04ecd8b0e82e687b327 +patch_args=-Np1 -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools" +if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then + broken="webengine can be built only if word size matches" fi -case "$XBPS_TARGET_MACHINE" in - arm*) broken="qt5-webengine not available" ;; -esac +if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then + broken="webengine only supports little endian" +fi