diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index 8ef3d74b2a..31bb6dcd0f 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -3,7 +3,6 @@ ac_add_options --libdir=/usr/lib ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --with-system-bz2 ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-libevent @@ -14,9 +13,6 @@ ac_add_options --without-system-png ac_add_options --enable-system-pixman ac_add_options --enable-system-ffi -ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr -ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr - nspr_config_args=" --libdir=${XBPS_CROSS_BASE}/usr/lib --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" @@ -25,7 +21,6 @@ nss_config_args=" --libdir=${XBPS_CROSS_BASE}/usr/lib --includedir=${XBPS_CROSS_BASE}/usr/include/nss" -ac_add_options --disable-gconf ac_add_options --disable-tests ac_add_options --disable-crashreporter ac_add_options --disable-updater diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch index aab9a0a305..c5e5c486dd 100644 --- a/srcpkgs/firefox/patches/sndio.patch +++ b/srcpkgs/firefox/patches/sndio.patch @@ -40,13 +40,13 @@ DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True if CONFIG['OS_TARGET'] == 'Darwin': ---- build/moz.configure/old.configure.orig -+++ build/moz.configure/old.configure -@@ -184,6 +184,7 @@ +--- build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 ++++ - 2020-06-30 12:18:26.027756310 +0200 +@@ -210,6 +210,7 @@ @old_configure_options( '--cache-file', '--datadir', + '--enable-sndio', - '--enable-cookies', - '--enable-cpp-rtti', '--enable-crashreporter', + '--enable-dbus', + '--enable-debug-js-modules', diff --git a/srcpkgs/firefox/patches/sqlite-be-crash.patch b/srcpkgs/firefox/patches/sqlite-be-crash.patch deleted file mode 100644 index 00cbbe1978..0000000000 --- a/srcpkgs/firefox/patches/sqlite-be-crash.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 90b1adc1f130148a11e1ae11a154edc67bc521f6 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 9 Feb 2020 16:47:57 +0100 -Subject: [PATCH] Fix segfault on some platforms - -This can be reproduced on e.g. firefox with ppc64 after updating -sqlite from 3.30.1. This is a cherry-pick of an upstream revision -that fixes the problem (https://sqlite.org/src/info/04885763c4cd00cb). ---- - sqlite3.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git sqlite3.c sqlite3.c -index 55dc686..0fb0b55 100644 ---- third_party/sqlite3/src/sqlite3.c -+++ third_party/sqlite3/src/sqlite3.c -@@ -121302,12 +121302,14 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( - x = *sqlite3VdbeGetOp(v, addrConflictCk); - if( x.opcode!=OP_IdxRowid ){ - int p2; /* New P2 value for copied conflict check opcode */ -+ const char *zP4; - if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){ - p2 = lblRecheckOk; - }else{ - p2 = x.p2; - } -- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type); -+ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z; -+ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type); - sqlite3VdbeChangeP5(v, x.p5); - VdbeCoverageIf(v, p2!=x.p2); - } --- -2.24.0 - diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 643632a7ff..4d9cc05e99 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=77.0.1 +version=78.0.1 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Johannes " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640 +checksum=494d277b120028e036e2aee3f658d79afc895457dc6aadb1c02f0547ef1d66ca lib32disabled=yes @@ -22,14 +22,13 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) - $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)" depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" -build_options="alsa jack dbus pulseaudio startup_notification xscreensaver sndio wayland" -build_options_default="alsa jack dbus pulseaudio startup_notification xscreensaver sndio wayland" +build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland" +build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" case $XBPS_TARGET_MACHINE in armv[56]*) broken="required NEON extensions are not supported on armv6" ;; @@ -167,7 +166,6 @@ ac_add_options $(vopt_enable sndio) ac_add_options $(vopt_enable dbus) ac_add_options $(vopt_enable dbus necko-wifi) ac_add_options $(vopt_enable pulseaudio) -ac_add_options $(vopt_enable startup_notification startup-notification) ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3') !