diff --git a/srcpkgs/icecat/patches/musl-rust.configure.patch b/srcpkgs/icecat/patches/musl-rust.configure.patch new file mode 100644 index 00000000000..d8f387136e0 --- /dev/null +++ b/srcpkgs/icecat/patches/musl-rust.configure.patch @@ -0,0 +1,26 @@ +--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700 ++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700 +@@ -297,11 +297,20 @@ + suffix = 'hf' + else: + suffix = '' ++ ++ narrowed = [] + for p in prefixes: + for c in candidates: +- if c.rust_target.startswith('{}-'.format(p)) and \ +- c.rust_target.endswith(suffix): +- return c.rust_target ++ if c.rust_target.startswith('{}-'.format(p)): ++ narrowed.append(c.rust_target) ++ ++ for target in narrowed: ++ if target.endswith(host_or_target.raw_os): ++ return target ++ ++ for target in narrowed: ++ if target.endswith(suffix): ++ return target + + # See if we can narrow down on the exact alias + narrowed = [c for c in candidates if c.target.alias == host_or_target.alias] diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 9bb3e5cfa0d..bc4e855005d 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,6 +1,6 @@ # Template file for 'icecat' pkgname=icecat -version=68.9.0 +version=68.10.0 revision=1 build_helper="rust" hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm @@ -18,7 +18,7 @@ maintainer="Jürgen Buchmüller " license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.gnu.org/software/${pkgname}/" distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz" -checksum=87d69b6726c4b0e3a816e8c583fcbe468192ee29321fd4bfa58fd46e9ae186e5 +checksum=b4dfc9644d64c1effa8f7721956274d071b897d1893b57f8b7bd7b749955f834 lib32disabled=yes build_options="alsa dbus gtk3 pulseaudio startup_notification sndio xscreensaver" @@ -26,7 +26,6 @@ build_options_default="alsa dbus gtk3 pulseaudio startup_notification sndio xscr case $XBPS_TARGET_MACHINE in armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;; - armv7*) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/26095/steps/shell_3/logs/stdio" ;; ppc64*) ;; ppc*) broken="xptcall bitrot" ;; esac