summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox-mozconfig2
-rw-r--r--firefox-nss-version.patch24
-rw-r--r--firefox.spec2
3 files changed, 13 insertions, 15 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 2f09eb2..9cae2b0 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -1,11 +1,9 @@
. $topsrcdir/browser/config/mozconfig
ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
ac_add_options --disable-strip
#ac_add_options --enable-libnotify
ac_add_options --enable-necko-wifi
-ac_add_options --enable-startup-notification
ac_add_options --disable-updater
ac_add_options --enable-chrome-format=omni
ac_add_options --enable-pulseaudio
diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch
index 652feab..fee93bb 100644
--- a/firefox-nss-version.patch
+++ b/firefox-nss-version.patch
@@ -1,12 +1,12 @@
-diff -up firefox-76.0/old-configure.in.nss-version firefox-76.0/old-configure.in
---- firefox-76.0/old-configure.in.nss-version 2020-05-03 19:12:01.771863688 +0200
-+++ firefox-76.0/old-configure.in 2020-05-03 19:17:53.216898766 +0200
-@@ -1506,7 +1506,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
- _USE_SYSTEM_NSS=1 )
-
- if test -n "$_USE_SYSTEM_NSS"; then
-- AM_PATH_NSS(3.52.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+ AM_PATH_NSS(3.52, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
-
- NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss"
+diff -up firefox-78.0/toolkit/moz.configure.nss-version firefox-78.0/toolkit/moz.configure
+--- firefox-78.0/toolkit/moz.configure.nss-version 2020-06-30 08:47:09.657501414 +0200
++++ firefox-78.0/toolkit/moz.configure 2020-06-30 08:47:12.652510169 +0200
+@@ -2089,7 +2089,7 @@ option('--with-system-nss', help='Use sy
+
+ imply_option('--with-system-nspr', True, when='--with-system-nss')
+
+-nss_pkg = pkg_check_modules('NSS', 'nss >= 3.53.1', when='--with-system-nss', config=False)
++nss_pkg = pkg_check_modules('NSS', 'nss >= 3.53.0', when='--with-system-nss', config=False)
+
+ set_config('MOZ_SYSTEM_NSS', True, when='--with-system-nss')
+
diff --git a/firefox.spec b/firefox.spec
index 01d1964..848d6f1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -359,7 +359,7 @@ This package contains results of tests executed during build.
%if 0%{?big_endian}
%patch26 -p1 -b .icu
%endif
-#%patch46 -p1 -b .nss-version
+%patch46 -p1 -b .nss-version
%patch47 -p1 -b .fedora-shebang
%patch48 -p1 -b .build-arm-wasm
%patch49 -p1 -b .build-arm-libaom
bgstack15