From bcb41f508349c1571f1157350f0b1a65ac461d56 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 3 Jul 2023 15:49:52 +0200
Subject: [PATCH] Update to build 2

---
 .gitignore                      |  1 +
 firefox-gcc-always-inline.patch | 36 ++++++++++++++++++++-------------
 firefox.spec                    |  6 +++---
 sources                         |  4 ++--
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index dfe937a..9a27e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -581,3 +581,4 @@ firefox-3.6.4.source.tar.bz2
 /firefox-114.0.2.source.tar.xz
 /firefox-langpacks-115.0-20230629.tar.xz
 /firefox-115.0.source.tar.xz
+/firefox-langpacks-115.0-20230703.tar.xz
diff --git a/firefox-gcc-always-inline.patch b/firefox-gcc-always-inline.patch
index d7af60f..d7ce687 100644
--- a/firefox-gcc-always-inline.patch
+++ b/firefox-gcc-always-inline.patch
@@ -1,14 +1,22 @@
-diff -up firefox-114.0.2/gfx/wr/swgl/src/gl.cc.inline firefox-114.0.2/gfx/wr/swgl/src/gl.cc
---- firefox-114.0.2/gfx/wr/swgl/src/gl.cc.inline	2023-06-22 11:08:53.294593327 +0200
-+++ firefox-114.0.2/gfx/wr/swgl/src/gl.cc	2023-06-22 11:12:43.663486734 +0200
-@@ -58,9 +58,7 @@ WINBASEAPI BOOL WINAPI QueryPerformanceF
- }
- 
- #else
--// GCC is slower when dealing with always_inline, especially in debug builds.
--// When using Clang, use always_inline more aggressively.
--#  if defined(__clang__) || defined(NDEBUG)
-+#  if defined(__clang__) || defined (__GNUC__) || defined(NDEBUG)
- #    define ALWAYS_INLINE __attribute__((always_inline)) inline
- #  else
- #    define ALWAYS_INLINE inline
+diff -up firefox-115.0/gfx/skia/generate_mozbuild.py.old firefox-115.0/gfx/skia/generate_mozbuild.py
+--- firefox-115.0/gfx/skia/generate_mozbuild.py.old	2023-07-03 15:45:48.324343303 +0200
++++ firefox-115.0/gfx/skia/generate_mozbuild.py	2023-07-03 15:46:03.098854139 +0200
+@@ -54,7 +54,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
+ if CONFIG['INTEL_ARCHITECTURE']:
+     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
+     SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
+-    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
+     SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']
+     if not CONFIG["MOZ_CODE_COVERAGE"]:
+       SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
+diff -up firefox-115.0/gfx/skia/moz.build.old firefox-115.0/gfx/skia/moz.build
+--- firefox-115.0/gfx/skia/moz.build.old	2023-07-03 15:45:29.988709343 +0200
++++ firefox-115.0/gfx/skia/moz.build	2023-07-03 15:45:39.971054486 +0200
+@@ -565,7 +565,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
+ if CONFIG['INTEL_ARCHITECTURE']:
+     SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
+     SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
+-    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
+     SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c', '-mfma']
+     if not CONFIG["MOZ_CODE_COVERAGE"]:
+         SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
diff --git a/firefox.spec b/firefox.spec
index 8b25ceb..60069b6 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -159,12 +159,12 @@ ExcludeArch: ppc64le
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        115.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?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}-20230629.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20230703.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -1056,7 +1056,7 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Thu Jun 29 2023 Martin Stransky <stransky@redhat.com>- 115.0-1
+* Thu Jun 29 2023 Martin Stransky <stransky@redhat.com>- 115.0-2
 - Update to 115.0
 
 * Thu Jun 29 2023 Martin Stransky <stransky@redhat.com>- 114.0.2-3
diff --git a/sources b/sources
index 94443e1..e7d32a4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 0d45c1decfd7aaee853748745c9f5a907c0c6a0cf809c2387aac1cdcf680b0844b1ef4d05148e0527de4ff6e4d4666110bea317bd00b7d73a1210eb58a815563
 SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
-SHA512 (firefox-langpacks-115.0-20230629.tar.xz) = b9c194a5a1f1178a926370a908ad9de71738eb8208e2a757160de2456394f406edac0dd71fcc9e030a7c90821695e5dd2e09ff912e1c8d3dbc82a2123083ad67
-SHA512 (firefox-115.0.source.tar.xz) = 6571ecd1c3ee345598c4eeb75554076ceada6d4ff91e133906dd59a9b2020c4e7b9ac07207da7a147790441c08afcfa5448a9adb679615d8a6712093e619f4a4
+SHA512 (firefox-langpacks-115.0-20230703.tar.xz) = f08362a0cd190526ac89c99b0ed305c77b3264045e15d6deacba13532d57022551154b3615b89dd0d40d8be38d6d209a79743917d73a5d9b65835149fd34ae63
+SHA512 (firefox-115.0.source.tar.xz) = ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2