diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-17 14:01:35 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-25 16:05:36 -0400 |
| commit | 86d2ae2190c1818ea2d990940715163240232cdb (patch) | |
| tree | 98fdc3f8d19993443f0cd1aaa717fdc4df699b0d | |
| parent | daa587973056a9759c2acfb694901cf68824ffc6 (diff) | |
[icecat]: tweak for 1686
| -rw-r--r-- | libre/icecat/PKGBUILD | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e2d101649..c7fcdbf06 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -37,7 +37,7 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python-setuptools python-psutil python-zstandard lld dump_syms) makedepends+=(jq python-jsonschema) -makedepends_i686=(gcc10) +#makedepends_i686=(gcc10) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -51,8 +51,9 @@ source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.ta ) source_armv7h=(arm.patch build-arm-libopus.patch) -source_i686=(avoid-libxul-OOM-python-check.patch - rust-static-disable-network-test-on-static-libraries.patch) +source_i686=('avoid-libxul-OOM-python-check.patch' + 'rust-static-disable-network-test-on-static-libraries.patch' + 'firefox-99.0.1-fdlibm-double.patch') sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' 'SKIP' 'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d' @@ -62,7 +63,8 @@ sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' - '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041') + '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' + '62695e56daf8c0b8bb921980d475b3fd169b9134188ad9ffaeb9cd660589c23d') validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds) @@ -199,11 +201,11 @@ ac_add_options --disable-linker=lld ac_add_options --enable-linker=bfd ac_add_options --disable-lto ac_add_options --disable-rust-simd -export CC=gcc-10 -export CXX=g++-10 -export AR=gcc-ar-10 -export NM=gcc-nm-10 -export RANLIB=gcc-ranlib-10 +export CC=gcc +export CXX=g++ +export AR=gcc-ar +export NM=gcc-nm +export RANLIB=gcc-ranlib export STRIP=strip END @@ -215,6 +217,14 @@ END # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757 echo "applying rust-static-disable-network-test-on-static-libraries.patch" patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch + + # FIXME: this patch is probably temporary - it comes from mozilla + # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + # /build/iceweasel/src/firefox-96.0.1/modules/fdlibm/src/math_private.h:34:21: + # error: conflicting declaration ‘typedef __double_t double_t’ + # /usr/include/math.h:156:21: note: previous declaration as ‘typedef long double double_t’ + echo "applying firefox-99.0.1-fdlibm-double.patch" + patch -p1 -i "$srcdir/firefox-99.0.1-fdlibm-double.patch" ;; x86_64) ;; |