summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2015-05-05 12:21:18 +0200
committerMartin Stransky <stransky@redhat.com>2015-05-05 12:21:18 +0200
commit5f3c74b65cdbfb07363bde64eec016d8ab29f600 (patch)
tree073ab3a00eccb473475b41263f79dff079c14073
parentMerge branch 'master' into f22 (diff)
parentnss version build fix (diff)
downloadlibrewolf-fedora-ff-5f3c74b65cdbfb07363bde64eec016d8ab29f600.tar.gz
librewolf-fedora-ff-5f3c74b65cdbfb07363bde64eec016d8ab29f600.tar.bz2
librewolf-fedora-ff-5f3c74b65cdbfb07363bde64eec016d8ab29f600.zip
Merge branch 'master' into f22
-rw-r--r--firefox-nss-3.18.0.patch13
-rw-r--r--firefox.spec2
2 files changed, 15 insertions, 0 deletions
diff --git a/firefox-nss-3.18.0.patch b/firefox-nss-3.18.0.patch
new file mode 100644
index 0000000..a693832
--- /dev/null
+++ b/firefox-nss-3.18.0.patch
@@ -0,0 +1,13 @@
+diff -up mozilla-release/configure.in.old mozilla-release/configure.in
+--- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200
++++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200
+@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
+ _USE_SYSTEM_NSS=1 )
+
+ if test -n "$_USE_SYSTEM_NSS"; then
+- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
++ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+
+ if test -n "$MOZ_NATIVE_NSS"; then
+diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile
diff --git a/firefox.spec b/firefox.spec
index c3cd04d..624c1b0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -143,6 +143,7 @@ Patch215: firefox-enable-addons.patch
Patch219: rhbz-1173156.patch
Patch220: rhbz-1014858.patch
Patch221: firefox-fedora-ua.patch
+Patch222: firefox-nss-3.18.0.patch
# Upstream patches
@@ -295,6 +296,7 @@ cd %{tarballdir}
%patch219 -p2 -b .rhbz-1173156
%patch220 -p1 -b .rhbz-1014858
%patch221 -p2 -b .fedora-ua
+%patch222 -p1 -b .nss-3.18.0
# Upstream patches
%if %{toolkit_gtk3}
bgstack15