Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2023-04-08 21:31:53 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2023-04-08 21:31:53 +0200
commitac911d8af7db73d9e83cf5e045becc2f0ac99dc7 (patch)
tree5c01bb4c5e25b0907017bd7956bd1ee24a3b813a
parentee19a1895403d52a28409aa6a3045a130dcea40e (diff)
extra/firefox: fixed fdlibm patch
-rw-r--r--extra/firefox/PKGBUILD4
-rw-r--r--extra/firefox/firefox-111.0.1-fdlibm.patch13
2 files changed, 10 insertions, 7 deletions
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index 3a18b1aa..b5dc7982 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -218,8 +218,8 @@ eval "$(
# /usr/include/math.h:169:21: note: previous declaration as ?typedef long double float_t?
# typedef long double float_t;
source+=('firefox-111.0.1-fdlibm.patch')
-sha256sums+=('c127120a600fca5a4de76ba6fdf50d7c06afc7913046299315e173e03c3e93e0')
-b2sums+=('44e421ac15c829e1a03dfdcc727fe01e4194e67ea96a1c85ebc79148e2567b074f90428de34230282d64d8fce9916500703357de8f65b5ee866933e57fe40e46')
+sha256sums+=('ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1')
+b2sums+=('05c7c9727201971650df4ca2e00539767fc9e159539835c641fccab5ec9577a7294e8f62f5d0670158316e5467ea121c03a36fd4ba153e1d60f3402f0430548d')
eval "$(
declare -f prepare | \
sed '
diff --git a/extra/firefox/firefox-111.0.1-fdlibm.patch b/extra/firefox/firefox-111.0.1-fdlibm.patch
index 4f600df4..f2c15a2b 100644
--- a/extra/firefox/firefox-111.0.1-fdlibm.patch
+++ b/extra/firefox/firefox-111.0.1-fdlibm.patch
@@ -1,18 +1,21 @@
diff -rauN firefox-111.0.1/modules/fdlibm/src/math_private.h firefox-111.0.1-fdlibm-patch/modules/fdlibm/src/math_private.h
--- firefox-111.0.1/modules/fdlibm/src/math_private.h 2023-03-21 14:16:09.000000000 +0100
-+++ firefox-111.0.1-fdlibm-patch/modules/fdlibm/src/math_private.h 2023-04-07 15:42:21.149010898 +0200
-@@ -30,9 +30,13 @@
++++ firefox-111.0.1-fdlibm-patch/modules/fdlibm/src/math_private.h 2023-04-08 16:50:07.828564320 +0200
+@@ -30,9 +30,17 @@
* Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
*/
+#if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2)
-+typedef long double __double_t;
++typedef long double __double_t;
+#else
typedef double __double_t;
+#endif
typedef __double_t double_t;
--typedef float __float_t;
-+/*typedef float __float_t;*/
++#if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2)
++typedef long double __float_t;
++#else
+ typedef float __float_t;
++#endif
/*
* The original fdlibm code used statements like: