From 198501e219431edb66bdb2fb886fcb90e257cfd2 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 30 Jan 2019 18:26:43 +0100 Subject: [PATCH] suil: fix build by patching out a check, remove nocross Qt5 ships this header even on non-Macs => the check breaks build as the respective obj-c stuff tries to include Cocoa. This also removes the requirement of an Obj-C++ compiler, so cross should work. --- srcpkgs/suil/patches/ftbfs-cocoa.patch | 16 ++++++++++++++++ srcpkgs/suil/template | 1 - 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/suil/patches/ftbfs-cocoa.patch diff --git a/srcpkgs/suil/patches/ftbfs-cocoa.patch b/srcpkgs/suil/patches/ftbfs-cocoa.patch new file mode 100644 index 00000000000..afaa297e4f8 --- /dev/null +++ b/srcpkgs/suil/patches/ftbfs-cocoa.patch @@ -0,0 +1,16 @@ +For whatever reason, Qt5 ships this header on Linux, it does on other +distros as well, therefore this check is incorrect and breaks build. + +--- wscript ++++ wscript +@@ -91,10 +91,6 @@ def configure(conf): + if not conf.options.no_qt5: + autowaf.check_pkg(conf, 'Qt5Widgets', uselib_store='QT5', + atleast_version='5.1.0', mandatory=False) +- if conf.check_cxx(header_name = 'QMacCocoaViewContainer', +- uselib = 'QT5', +- mandatory = False): +- autowaf.define(conf, 'SUIL_WITH_COCOA_IN_QT5', 1) + + conf.check_cc(define_name = 'HAVE_LIBDL', + lib = 'dl', diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template index 4bae7af4a2e..fb696861e0e 100644 --- a/srcpkgs/suil/template +++ b/srcpkgs/suil/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://drobilla.net/software/suil/" distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=9f445910627fb30f4c182b9ee00d1030324910d8a9ce7c9654c34465411da401 -nocross="Objective-C++ compiler not installed on this system" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel"