From ee371f01de59af53376e83f1cbc1b63ec90bb2ac Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 7 Feb 2023 11:52:32 +0100 Subject: [PATCH] Rawhide/GCC 13 build fixes --- firefox-gcc-13-build.patch | 24 ++++++++++++++++++++++++ firefox.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 firefox-gcc-13-build.patch diff --git a/firefox-gcc-13-build.patch b/firefox-gcc-13-build.patch new file mode 100644 index 0000000..8512b76 --- /dev/null +++ b/firefox-gcc-13-build.patch @@ -0,0 +1,24 @@ +--- firefox-109.0.1/gfx/2d/Rect.h.old 2023-02-07 09:44:24.946279843 +0100 ++++ firefox-109.0.1/gfx/2d/Rect.h 2023-02-07 09:44:47.969032049 +0100 +@@ -324,8 +324,8 @@ IntRectTyped RoundedToInt(const R + + template + bool RectIsInt32Safe(const RectTyped& aRect) { +- float min = (float)std::numeric_limits::min(); +- float max = (float)std::numeric_limits::max(); ++ float min = (float)std::numeric_limits::min(); ++ float max = (float)std::numeric_limits::max(); + return aRect.x > min && aRect.y > min && aRect.width < max && + aRect.height < max && aRect.XMost() < max && aRect.YMost() < max; + } +diff -up firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp.old firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp +--- firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp.old 2023-02-07 11:03:41.788720090 +0100 ++++ firefox-109.0.1/toolkit/components/telemetry/pingsender/pingsender.cpp 2023-02-07 11:04:29.195345659 +0100 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/firefox.spec b/firefox.spec index 24bc1d5..4a8d830 100644 --- a/firefox.spec +++ b/firefox.spec @@ -173,7 +173,7 @@ ExcludeArch: i686 Summary: Mozilla Firefox Web browser Name: firefox Version: 109.0.1 -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 @@ -225,6 +225,7 @@ Patch55: firefox-testing.patch Patch61: firefox-glibc-dynstack.patch Patch71: 0001-GLIBCXX-fix-for-GCC-12.patch Patch78: firefox-i686-build.patch +Patch79: firefox-gcc-13-build.patch # Test patches # Generate without context by @@ -503,6 +504,7 @@ This package contains results of tests executed during build. %patch54 -p1 -b .1669639 %patch71 -p1 -b .0001-GLIBCXX-fix-for-GCC-12 %patch78 -p1 -b .firefox-i686 +%patch79 -p1 -b .firefox-gcc-13-build # Test patches #%patch100 -p1 -b .firefox-tests-xpcshell @@ -1080,6 +1082,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Feb 7 2023 Martin Stransky - 109.0.1-2 +- Rawhide build fix + * Wed Feb 1 2023 Martin Stransky - 109.0.1-1 - Updated to 109.0.1 - Added fix for rhbz#2147344 / mzbz#1813500.