Updated to 95.0

4 files changed, 46 insertions, 38 deletions

diff --git a/.gitignore b/.gitignore
index 75510b1..6138c83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -481,3 +481,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-94.0-20211031.tar.xz
 /firefox-94.0.2.source.tar.xz
 /firefox-langpacks-94.0.2-20211125.tar.xz
+/firefox-95.0.source.tar.xz
+/firefox-langpacks-95.0-20211203.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 51bf73c..865699d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -162,13 +162,13 @@ ExcludeArch: aarch64
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        94.0.2
+Version:        95.0
 Release:        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
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20211125.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20211203.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -457,7 +457,7 @@ This package contains results of tests executed during build.
 %patch49 -p1 -b .build-arm-libaom
 %patch53 -p1 -b .firefox-gcc-build
 %patch54 -p1 -b .1669639
-%patch55 -p1 -b .testing
+#%patch55 -p1 -b .testing
 %patch57 -p1 -b .ffvpx-with-vapi
 #%patch61 -p1 -b .glibc-dynstack
 
@@ -1052,6 +1052,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Dec 3 2021 Martin Stransky <stransky@redhat.com> - 95.0-1
+- Updated to 95.0
+
 * Fri Nov 19 2021 Martin Stransky <stransky@redhat.com> - 94.0-2
 - Added fix for mozbz#1739924 / rhbz#2020981.
 
diff --git a/pgo.patch b/pgo.patch
index 13a445b..bd92d1f 100644
--- a/pgo.patch
+++ b/pgo.patch
@@ -1,26 +1,29 @@
-diff -up firefox-88.0/build/moz.configure/lto-pgo.configure.pgo firefox-88.0/build/moz.configure/lto-pgo.configure
---- firefox-88.0/build/moz.configure/lto-pgo.configure.pgo	2021-04-15 21:44:26.000000000 +0200
-+++ firefox-88.0/build/moz.configure/lto-pgo.configure	2021-04-19 13:45:00.240696430 +0200
-@@ -240,13 +240,13 @@ def lto(
-                 cflags.append("-flto")
-                 ldflags.append("-flto")
-             else:
--                cflags.append("-flto=thin")
--                ldflags.append("-flto=thin")
-+                cflags.append("-flto")
-+                ldflags.append("-flto")
-         elif c_compiler.type == "clang-cl":
-             if len(value) and value[0].lower() == "full":
-                 cflags.append("-flto")
-             else:
--                cflags.append("-flto=thin")
-+                cflags.append("-flto")
-             # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
-             # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
-             cflags.append("-fuse-ld=lld")
-diff -up firefox-88.0/build/pgo/profileserver.py.pgo firefox-88.0/build/pgo/profileserver.py
---- firefox-88.0/build/pgo/profileserver.py.pgo	2021-04-15 21:44:26.000000000 +0200
-+++ firefox-88.0/build/pgo/profileserver.py	2021-04-19 13:45:00.240696430 +0200
+diff -up firefox-95.0/build/moz.configure/lto-pgo.configure.pgo firefox-95.0/build/moz.configure/lto-pgo.configure
+--- firefox-95.0/build/moz.configure/lto-pgo.configure.pgo	2021-12-03 16:04:48.441167077 +0100
++++ firefox-95.0/build/moz.configure/lto-pgo.configure	2021-12-03 16:06:19.129415806 +0100
+@@ -248,8 +248,8 @@ def lto(
+             cflags.append("-flto")
+             ldflags.append("-flto")
+         else:
+-            cflags.append("-flto=thin")
+-            ldflags.append("-flto=thin")
++            cflags.append("-flto")
++            ldflags.append("-flto")
+ 
+         if target.os == "Android" and value == "cross":
+             # Work around https://github.com/rust-lang/rust/issues/90088
+@@ -265,7 +265,7 @@ def lto(
+         if value == "full":
+             cflags.append("-flto")
+         else:
+-            cflags.append("-flto=thin")
++            cflags.append("-flto")
+         # With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
+         # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
+         cflags.append("-fuse-ld=lld")
+diff -up firefox-95.0/build/pgo/profileserver.py.pgo firefox-95.0/build/pgo/profileserver.py
+--- firefox-95.0/build/pgo/profileserver.py.pgo	2021-11-29 15:01:10.000000000 +0100
++++ firefox-95.0/build/pgo/profileserver.py	2021-12-03 16:04:48.441167077 +0100
 @@ -11,7 +11,7 @@ import glob
  import subprocess
  
@@ -67,9 +70,9 @@ diff -up firefox-88.0/build/pgo/profileserver.py.pgo firefox-88.0/build/pgo/prof
          llvm_profdata = env.get("LLVM_PROFDATA")
          if llvm_profdata:
              profraw_files = glob.glob("*.profraw")
-diff -up firefox-88.0/build/unix/mozconfig.unix.pgo firefox-88.0/build/unix/mozconfig.unix
---- firefox-88.0/build/unix/mozconfig.unix.pgo	2021-04-15 21:44:26.000000000 +0200
-+++ firefox-88.0/build/unix/mozconfig.unix	2021-04-19 13:45:00.240696430 +0200
+diff -up firefox-95.0/build/unix/mozconfig.unix.pgo firefox-95.0/build/unix/mozconfig.unix
+--- firefox-95.0/build/unix/mozconfig.unix.pgo	2021-11-29 15:01:10.000000000 +0100
++++ firefox-95.0/build/unix/mozconfig.unix	2021-12-03 16:04:48.441167077 +0100
 @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
      CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
      CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@@ -86,19 +89,19 @@ diff -up firefox-88.0/build/unix/mozconfig.unix.pgo firefox-88.0/build/unix/mozc
      # We want to make sure we use binutils and other binaries in the tooltool
      # package.
      mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
-diff -up firefox-88.0/extensions/spellcheck/src/moz.build.pgo firefox-88.0/extensions/spellcheck/src/moz.build
---- firefox-88.0/extensions/spellcheck/src/moz.build.pgo	2021-04-15 21:44:28.000000000 +0200
-+++ firefox-88.0/extensions/spellcheck/src/moz.build	2021-04-19 13:45:00.240696430 +0200
+diff -up firefox-95.0/extensions/spellcheck/src/moz.build.pgo firefox-95.0/extensions/spellcheck/src/moz.build
+--- firefox-95.0/extensions/spellcheck/src/moz.build.pgo	2021-11-29 15:01:12.000000000 +0100
++++ firefox-95.0/extensions/spellcheck/src/moz.build	2021-12-03 16:04:48.441167077 +0100
 @@ -31,3 +31,5 @@ EXPORTS.mozilla += [
  
  if CONFIG["CC_TYPE"] in ("clang", "gcc"):
      CXXFLAGS += ["-Wno-error=shadow"]
 +
 +CXXFLAGS += ['-fno-devirtualize']
-diff -up firefox-88.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-88.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-88.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2021-04-19 13:45:00.240696430 +0200
-+++ firefox-88.0/toolkit/components/terminator/nsTerminator.cpp	2021-04-19 13:46:01.144530790 +0200
-@@ -456,6 +456,11 @@ void nsTerminator::StartWatchdog() {
+diff -up firefox-95.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-95.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-95.0/toolkit/components/terminator/nsTerminator.cpp.pgo	2021-11-29 15:01:30.000000000 +0100
++++ firefox-95.0/toolkit/components/terminator/nsTerminator.cpp	2021-12-03 16:04:48.442167068 +0100
+@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
    }
  #endif
  
diff --git a/sources b/sources
index 11f8c27..4b2f60b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = b9ab1498be90ecf60822df7021f8812f124550d97f8cd687c69d3ab56fc5fb714bfe88c78c978a1794d211724909a9a5cad6a4b483fa05f762909c45d5075520
 SHA512 (mochitest-python.tar.gz) = 18e1aeb475df5fbf1fe3838897d5ac2f3114aa349030713fc2be27af087b1b12f57642621b87bd052f324a7cb7fbae5f36b21502191d85692f62c8cdd69c8bf2
-SHA512 (firefox-94.0.2.source.tar.xz) = 00ce4f6be711e1f309828e030163e61bbd9fe3364a8e852e644177c93832078877dea1a516719b106a52c0d8462193ed52c1d3cc7ae34ea021eb1dd0f5b685e2
-SHA512 (firefox-langpacks-94.0.2-20211125.tar.xz) = 14421acd21a9faeb7543467d015a00db1b945e5be7db9ced9edcd7480177a4bf9273225463aa18f62c0217f33ff6984e63dff574f68ee3603a5d10215a1ecd50
+SHA512 (firefox-95.0.source.tar.xz) = 350672a2cd99195c67dafc0e71c6eaf1e23e85a5fe92775697119a054f17c34a736035e23d7f2bb404b544f0f144efef3843cfc293596a6e61d1ea36efc3a724
+SHA512 (firefox-langpacks-95.0-20211203.tar.xz) = 86b1aa8744a7f658c3c610a4950a444cd9369c0b1434655f2235664f18a2c2ceeae91154b73dcffb8d75aa996dcd864a5c83c39075a79215c844daf7d4996b4c