diff options
| -rw-r--r-- | firefox-nss-version.patch | 14 | ||||
| -rw-r--r-- | firefox.spec | 29 |
2 files changed, 21 insertions, 22 deletions
diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch index a025e09..26d635c 100644 --- a/firefox-nss-version.patch +++ b/firefox-nss-version.patch @@ -1,14 +1,12 @@ -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, +diff -up firefox-71.0/old-configure.in.nss-version firefox-71.0/old-configure.in +--- firefox-71.0/old-configure.in.nss-version 2019-11-25 15:15:15.767572575 +0100 ++++ firefox-71.0/old-configure.in 2019-11-25 15:16:47.363498527 +0100 +@@ -1512,7 +1512,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])]) +- AM_PATH_NSS(3.47.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.47.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 7bd1ce0..a75602f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,5 +1,5 @@ # Set to true if it's going to be submitted as update. -%global release_build 1 +%global release_build 0 # Disabled arm due to rhbz#1658940 ExcludeArch: armv7hl @@ -93,11 +93,12 @@ ExcludeArch: ppc64le Summary: Mozilla Firefox Web browser Name: firefox -Version: 70.0.1 -Release: 5%{?pre_tag}%{?dist} +Version: 71.0 +Release: 0.1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ -Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz +#Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz +Source0: firefox-71.0b12.source.tar.xz %if %{with langpacks} Source1: firefox-langpacks-%{version}%{?pre_version}-20191101.tar.xz %endif @@ -150,7 +151,7 @@ Patch412: mozilla-1337988.patch Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch Patch417: bug1375074-save-restore-x28.patch Patch419: mozilla-1568569.patch -Patch421: mozilla-1579023.patch +#Patch421: mozilla-1579023.patch - 71 Patch422: mozilla-1580174-webrtc-popup.patch Patch423: D49289-wayland-monitor-size.diff Patch424: D53011-remote-content-disappear-fix.diff @@ -158,9 +159,9 @@ Patch425: D53965-dropdown-missing-on-multimonitor.diff # Wayland specific upstream patches Patch574: firefox-pipewire.patch -Patch575: mozilla-1548475.patch +#Patch575: mozilla-1548475.patch - 71 Patch590: firefox-wayland-cache-missing.patch -Patch591: mozilla-1587008.patch +#Patch591: mozilla-1587008.patch # PGO/LTO patches Patch600: pgo.patch @@ -350,7 +351,7 @@ This package contains results of tests executed during build. %patch215 -p1 -b .addons %patch219 -p1 -b .rhbz-1173156 %patch221 -p1 -b .fedora-ua -%patch224 -p1 -b .1170092 +#%patch224 -p1 -b .1170092 #ARM run-time patch %ifarch aarch64 %patch226 -p1 -b .1354671 @@ -362,9 +363,9 @@ This package contains results of tests executed during build. %ifarch %{arm} %patch415 -p1 -b .1238661 %endif -%patch419 -p1 -b .1568569 -%patch421 -p1 -b .1579023 -%patch423 -p1 -b .D49289 +#%patch419 -p1 -b .1568569 +#%patch421 -p1 -b .1579023 - 71 +#%patch423 -p1 -b .D49289 # overflow widgets broken %patch424 -p1 -b .D53011 # dropdown missing on multimonitor @@ -372,13 +373,13 @@ This package contains results of tests executed during build. # Wayland specific upstream patches %patch574 -p1 -b .firefox-pipewire -%patch575 -p1 -b .mozilla-1548475 +#%patch575 -p1 -b .mozilla-1548475 - 71 %patch590 -p1 -b .cache-missing -%patch591 -p1 -b .mozilla-1587008 +#%patch591 -p1 -b .mozilla-1587008 # PGO patches %patch600 -p1 -b .pgo -%patch601 -p1 -b .1516081 +#%patch601 -p1 -b .1516081 %patch602 -p1 -b .1516803 %{__rm} -f .mozconfig |