From 7d86351bf563be2ee6671403b9d139cf3b88bf6a Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 9 Aug 2018 21:36:02 +0200 Subject: [PATCH] firefox: update to 61.0.2 Building with system cairo is no longer supported (firefox>=60). See https://bugzilla.mozilla.org/show_bug.cgi?id=1432751. --- srcpkgs/firefox/files/mozconfig | 4 ---- srcpkgs/firefox/template | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index 05965d93c2d..3fd2699ae52 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -2,10 +2,6 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib ac_add_options --with-pthreads -# XXX build without system cairo see: -# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 -# - https://bugs.gentoo.org/show_bug.cgi?id=558150 -# ac_add_options --with-system-cairo ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-bz2 diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 359843748d4..ee8ac8407cb 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,14 +3,14 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=61.0 -revision=2 +version=61.0.2 +revision=1 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=3453e8ac7c602390bda0d34a4a636e0d65fd89d9ae69f7aa1740926715c42268 +checksum=0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes @@ -25,7 +25,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel)" -depends="nss>=3.37 desktop-file-utils hicolor-icon-theme" +depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio"