From 72165250a329c2f4f5532df4cffbdc5e4933d407 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Mon, 25 Apr 2022 17:14:03 +0200 Subject: extra/firefox: added a patch for redifition of double_t --- extra/firefox/PKGBUILD | 11 +++++++++++ extra/firefox/firefox-99.0.1-fdlibm-double.patch | 15 +++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 extra/firefox/firefox-99.0.1-fdlibm-double.patch (limited to 'extra/firefox') diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 96bfabae..6adbe422 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -219,3 +219,14 @@ eval "$( /export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE/,/fi/{s/\(.*\)/#\1/g} ' )" + +# 214:49.30 /build/firefox/src/firefox-99.0.1/modules/fdlibm/src/math_private.h:34:21: error: conflicting d +# eclaration ‘typedef __double_t double_t’ +source+=('firefox-99.0.1-fdlibm-double.patch') +sha256sums+=('62695e56daf8c0b8bb921980d475b3fd169b9134188ad9ffaeb9cd660589c23d') +eval "$( + declare -f prepare | \ + sed ' + $ i patch -p1 -i "$srcdir/firefox-99.0.1-fdlibm-double.patch" + ' +)" diff --git a/extra/firefox/firefox-99.0.1-fdlibm-double.patch b/extra/firefox/firefox-99.0.1-fdlibm-double.patch new file mode 100644 index 00000000..ffd4b1d7 --- /dev/null +++ b/extra/firefox/firefox-99.0.1-fdlibm-double.patch @@ -0,0 +1,15 @@ +diff -rauN firefox-99.0.1/modules/fdlibm/src/math_private.h firefox-99.0.1-fdlibm-double-patch/modules/fdlibm/src/math_private.h +--- firefox-99.0.1/modules/fdlibm/src/math_private.h 2022-04-12 00:00:09.000000000 +0200 ++++ firefox-99.0.1-fdlibm-double-patch/modules/fdlibm/src/math_private.h 2022-04-25 16:47:00.697715429 +0200 +@@ -30,7 +30,11 @@ + * 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; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + + /* -- cgit v1.2.3-70-g09d2