From a534d9f0a514af006a540d6ecb19121f27f6ee17 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 21 Oct 2019 15:15:55 +0200 Subject: relax nss version --- firefox-nss-version.patch | 14 ++++++++++++++ firefox.spec | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 firefox-nss-version.patch diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch new file mode 100644 index 0000000..a025e09 --- /dev/null +++ b/firefox-nss-version.patch @@ -0,0 +1,14 @@ +diff -up firefox-70.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-70.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium +diff -up firefox-70.0/media/webrtc/trunk/Makefile.old firefox-70.0/media/webrtc/trunk/Makefile +diff -up firefox-70.0/old-configure.in.old firefox-70.0/old-configure.in +--- firefox-70.0/old-configure.in.old 2019-10-21 15:13:50.777374423 +0200 ++++ firefox-70.0/old-configure.in 2019-10-21 15:13:59.803371294 +0200 +@@ -1530,7 +1530,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.46.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.46.0, [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 --git a/firefox.spec b/firefox.spec index 7a3dffc..1c42369 100644 --- a/firefox.spec +++ b/firefox.spec @@ -132,6 +132,7 @@ Patch40: build-aarch64-skia.patch Patch41: build-disable-elfhack.patch Patch44: build-arm-libopus.patch #Patch45: build-disable-multijobs-rust.patch +Patch46: firefox-nss-version.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -340,6 +341,7 @@ This package contains results of tests executed during build. %if 0%{?big_endian} %patch26 -p1 -b .icu %endif +%patch46 -p1 -b .nss-version # Fedora patches %patch215 -p1 -b .addons -- cgit