commit 023093196dc2182327a68e0c5ca4a1afea287bb6
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Wed Oct 6 01:37:38 2021 +0200
- do not redefine double_t from glibc math.h
firefox.spec | 2 ++
glibc-double.patch | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
---
diff --git a/firefox.spec b/firefox.spec
index bb5b24f..81221e2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -261,6 +261,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
@@ -2111,6 +2112,7 @@ unpack() {
%patch8 -p2
%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
index 0000000..ca72249
--- /dev/null
+++ b/glibc-double.patch
@@ -0,0 +1,20 @@
+--- 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 "fdlibm.h"
+
+@@ -30,8 +31,7 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
+-typedef double __double_t;
+-typedef __double_t double_t;
++typedef double_t __double_t;
+
+ /*
+ * The original fdlibm code used statements like:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/firefox.git/commitdiff/023093196dc2182327a68e0c5ca4a1afea287bb6
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
