From 604b1695a8756781a18036076aaa589b703592a5 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 18 Apr 2017 11:38:08 +0200 Subject: [PATCH] build with nss 3.29.3 --- firefox-nss-version.patch | 13 +++++++++++++ firefox.spec | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) 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..154d205 --- /dev/null +++ b/firefox-nss-version.patch @@ -0,0 +1,13 @@ +diff -up firefox-53.0/media/webrtc/trunk/Makefile.old firefox-53.0/media/webrtc/trunk/Makefile +diff -up firefox-53.0/old-configure.in.old firefox-53.0/old-configure.in +--- firefox-53.0/old-configure.in.old 2017-04-18 11:33:53.724460667 +0200 ++++ firefox-53.0/old-configure.in 2017-04-18 11:34:08.728405522 +0200 +@@ -2040,7 +2040,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.29.5, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.29.3, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + + if test -n "$MOZ_SYSTEM_NSS"; then diff --git a/firefox.spec b/firefox.spec index c4d94bd..e54310b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -141,10 +141,10 @@ Patch224: mozilla-1170092.patch Patch225: mozilla-1005640-accept-lang.patch #ARM run-time patch Patch226: rhbz-1354671.patch - # Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm Patch227: rhbz-1400293-fix-mozilla-1324096.patch Patch228: rhbz-1400293-workaround.patch +Patch229: firefox-nss-version.patch # Upstream patches Patch304: mozilla-1253216.patch @@ -302,13 +302,13 @@ cd %{tarballdir} %ifarch aarch64 %patch226 -p1 -b .1354671 %endif - %if 0%{?fedora} > 25 # Fix depends on p11-kit-trust 0.23.4 and enhanced ca-certificates.rpm %patch227 -p1 -b .rh1400293 %else %patch228 -p1 -b .rh1400293 %endif +%patch229 -p1 -b .nss-version %patch304 -p1 -b .1253216 %patch402 -p1 -b .1196777