diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-01-27 03:23:50 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-01-28 04:00:00 -0500 |
| commit | 4d346b9214c8f3ec963c31d9017fe09e8bddf72c (patch) | |
| tree | 37c15653c26b7f2d5410a7704e64763826e3e57f /libre | |
| parent | 4677fddf9e45a3ff54c894433bd3890341ef7c07 (diff) | |
| download | abslibre-4d346b9214c8f3ec963c31d9017fe09e8bddf72c.tar.gz abslibre-4d346b9214c8f3ec963c31d9017fe09e8bddf72c.tar.bz2 abslibre-4d346b9214c8f3ec963c31d9017fe09e8bddf72c.zip | |
[iceweasel]: tweak for i686
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index b492e6acf..29a9db758 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -53,16 +53,18 @@ pkgrel+=.parabola1 _brandingver=95.0-1 pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) license=(MPL GPL LGPL) url="https://wiki.parabola.nu/Iceweasel" depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) 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) + python-setuptools python-psutil python-zstandard lld dump_syms + wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) -makedepends_x86_64=(wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) -makedepends_i686=(wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi gcc10) +makedepends_i686=(gcc10) +[[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]/jack/jack2} ) +makedepends_i686+=(wasi-compiler-rt=12.0.1 wasi-libc++=12.0.1 wasi-libc++abi=12.0.1) # wasi-libc=???) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -82,7 +84,8 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.bra vendor.js.in) source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' - 'rust-static-disable-network-test-on-static-libraries.patch') + 'rust-static-disable-network-test-on-static-libraries.patch' + 'firefox-93.0_x86_math_private_20211110.patch') sha256sums=('cb86f3cbd31960305dee7d7f3dc254c64fb0462e27ea624ee62f3682e99079ee' 'SKIP' '5ead90994f91bed3231c2661977c69fc276cfbe278a1ab904daa544c9455ff42' @@ -94,9 +97,10 @@ sha256sums+=('d1b9d98cea5356df97fc5c221830de1ced8f826cb39fac9427c407e3eae54c02' '39e3a5e1ad137e21f842a44d7e3bd24050292d2b41fe59b4e7c7dfed52a195dd' '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83' 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d') -sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' - '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') +sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' + '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' + '84836b905d23a6cfdd955b9312bbb794e5329af36963c81572195039c68291fc') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger @@ -238,6 +242,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-93.0_x86_math_private_20211110.patch" + patch -p1 -i ../firefox-93.0_x86_math_private_20211110.patch ;; x86_64) ;; |