bring back and adjust glibc-double patch; rel 2

still required on i686 after all

diff --git a/firefox.spec b/firefox.spec
index b82424c5e8a4ec23a95d6884167113edcd933aff..d2f9d591337c83d2e22f192a86d13e3714ddef5e 100644 (file)
--- a/firefox.spec
+++ b/firefox.spec
@@ -51,7 +51,7 @@ Summary(hu.UTF-8):    Firefox web böngésző
 Summary(pl.UTF-8):     Firefox - przeglądarka WWW
 Name:          firefox
 Version:       105.0
-Release:       1
+Release:       2
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       https://releases.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
@@ -263,6 +263,7 @@ Patch7:             %{name}-middle_click_paste.patch
 Patch8:                %{name}-system-virtualenv.patch
 Patch9:                %{name}-Disable-Firefox-Health-Report.patch
 Patch10:       system-cairo.patch
+Patch11:       glibc-double.patch
 URL:           https://www.mozilla.org/firefox/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
@@ -2124,6 +2125,7 @@ unpack() {
 %patch8 -p1
 %patch9 -p1
 %{?with_system_cairo:%patch10 -p1}
+%patch11 -p1
 
 %if %{with pgo}
 %{__sed} -i -e 's@__BROWSER_PATH__@"../../dist/bin/firefox-bin"@' build/automation.py.in

diff --git a/glibc-double.patch b/glibc-double.patch
new file mode 100644 (file)
index 0000000..8f93af2
--- /dev/null
+++ b/glibc-double.patch
@@ -0,0 +1,23 @@
+--- firefox-93.0/modules/fdlibm/src/math_private.h.orig        2021-09-28 00:47:42.000000000 +0200
++++ firefox-93.0/modules/fdlibm/src/math_private.h     2021-10-06 01:23:47.611144150 +0200
+@@ -20,6 +20,7 @@
+ #include <cfloat>
+ #include <stdint.h>
+ #include <sys/types.h>
++#include <math.h>
+ 
+ #include "mozilla/EndianUtils.h"
+ 
+@@ -30,10 +31,8 @@
+  * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+  */
+ 
+-typedef double      __double_t;
+-typedef __double_t  double_t;
+-typedef float       __float_t;
+-typedef __float_t   float_t;
++typedef double_t  __double_t;
++typedef float_t  __float_t;
+ 
+ /*
+  * The original fdlibm code used statements like: