* update thunderbird to 128.2.1-1

This commit is contained in:
Alexander Baldeck 2024-09-18 18:24:13 +02:00
parent 76d524e280
commit 01d67a7a89
36 changed files with 566 additions and 1699 deletions

426
thunderbird/.SRCINFO Normal file
View File

@ -0,0 +1,426 @@
pkgbase = thunderbird
pkgdesc = Standalone mail and news reader from mozilla.org
pkgver = 128.2.1
pkgrel = 1
url = https://www.thunderbird.net/
arch = x86_64
license = MPL-2.0
license = GPL-2.0-only
license = LGPL-2.1-only
makedepends = unzip
makedepends = zip
makedepends = diffutils
makedepends = python
makedepends = nasm
makedepends = mesa
makedepends = libpulse
makedepends = libice
makedepends = libsm
makedepends = rust
makedepends = clang
makedepends = llvm
makedepends = cbindgen
makedepends = nodejs
makedepends = lld
makedepends = gawk
makedepends = perl
makedepends = findutils
makedepends = libotr
makedepends = wasi-compiler-rt
makedepends = wasi-libc
makedepends = wasi-libc++
makedepends = wasi-libc++abi
depends = glibc
depends = gtk3
depends = libgdk-3.so
depends = libgtk-3.so
depends = mime-types
depends = dbus
depends = libdbus-1.so
depends = dbus-glib
depends = alsa-lib
depends = nss
depends = hunspell
depends = sqlite
depends = ttf-font
depends = libvpx
depends = libvpx.so
depends = zlib
depends = bzip2
depends = libbz2.so
depends = botan2
depends = libwebp
depends = libwebp.so
depends = libwebpdemux.so
depends = libevent
depends = libjpeg-turbo
depends = libffi
depends = libffi.so
depends = nspr
depends = gcc-libs
depends = libx11
depends = libxrender
depends = libxfixes
depends = libxext
depends = libxcomposite
depends = libxdamage
depends = pango
depends = libpango-1.0.so
depends = cairo
depends = gdk-pixbuf2
depends = freetype2
depends = libfreetype.so
depends = fontconfig
depends = libfontconfig.so
depends = glib2
depends = libglib-2.0.so
depends = pixman
depends = libpixman-1.so
depends = gnupg
depends = json-c
depends = libcanberra
depends = ffmpeg
depends = icu
depends = libicui18n.so
depends = libicuuc.so
noextract = thunderbird-i18n-128.2.1-af.xpi
noextract = thunderbird-i18n-128.2.1-ar.xpi
noextract = thunderbird-i18n-128.2.1-ast.xpi
noextract = thunderbird-i18n-128.2.1-be.xpi
noextract = thunderbird-i18n-128.2.1-bg.xpi
noextract = thunderbird-i18n-128.2.1-br.xpi
noextract = thunderbird-i18n-128.2.1-ca.xpi
noextract = thunderbird-i18n-128.2.1-cak.xpi
noextract = thunderbird-i18n-128.2.1-cs.xpi
noextract = thunderbird-i18n-128.2.1-cy.xpi
noextract = thunderbird-i18n-128.2.1-da.xpi
noextract = thunderbird-i18n-128.2.1-de.xpi
noextract = thunderbird-i18n-128.2.1-dsb.xpi
noextract = thunderbird-i18n-128.2.1-el.xpi
noextract = thunderbird-i18n-128.2.1-en-GB.xpi
noextract = thunderbird-i18n-128.2.1-en-US.xpi
noextract = thunderbird-i18n-128.2.1-es-AR.xpi
noextract = thunderbird-i18n-128.2.1-es-ES.xpi
noextract = thunderbird-i18n-128.2.1-et.xpi
noextract = thunderbird-i18n-128.2.1-eu.xpi
noextract = thunderbird-i18n-128.2.1-fi.xpi
noextract = thunderbird-i18n-128.2.1-fr.xpi
noextract = thunderbird-i18n-128.2.1-fy-NL.xpi
noextract = thunderbird-i18n-128.2.1-ga-IE.xpi
noextract = thunderbird-i18n-128.2.1-gd.xpi
noextract = thunderbird-i18n-128.2.1-gl.xpi
noextract = thunderbird-i18n-128.2.1-he.xpi
noextract = thunderbird-i18n-128.2.1-hr.xpi
noextract = thunderbird-i18n-128.2.1-hsb.xpi
noextract = thunderbird-i18n-128.2.1-hu.xpi
noextract = thunderbird-i18n-128.2.1-hy-AM.xpi
noextract = thunderbird-i18n-128.2.1-id.xpi
noextract = thunderbird-i18n-128.2.1-is.xpi
noextract = thunderbird-i18n-128.2.1-it.xpi
noextract = thunderbird-i18n-128.2.1-ja.xpi
noextract = thunderbird-i18n-128.2.1-ka.xpi
noextract = thunderbird-i18n-128.2.1-kab.xpi
noextract = thunderbird-i18n-128.2.1-kk.xpi
noextract = thunderbird-i18n-128.2.1-ko.xpi
noextract = thunderbird-i18n-128.2.1-lt.xpi
noextract = thunderbird-i18n-128.2.1-ms.xpi
noextract = thunderbird-i18n-128.2.1-nb-NO.xpi
noextract = thunderbird-i18n-128.2.1-nl.xpi
noextract = thunderbird-i18n-128.2.1-nn-NO.xpi
noextract = thunderbird-i18n-128.2.1-pa-IN.xpi
noextract = thunderbird-i18n-128.2.1-pl.xpi
noextract = thunderbird-i18n-128.2.1-pt-BR.xpi
noextract = thunderbird-i18n-128.2.1-pt-PT.xpi
noextract = thunderbird-i18n-128.2.1-rm.xpi
noextract = thunderbird-i18n-128.2.1-ro.xpi
noextract = thunderbird-i18n-128.2.1-ru.xpi
noextract = thunderbird-i18n-128.2.1-sk.xpi
noextract = thunderbird-i18n-128.2.1-sl.xpi
noextract = thunderbird-i18n-128.2.1-sq.xpi
noextract = thunderbird-i18n-128.2.1-sr.xpi
noextract = thunderbird-i18n-128.2.1-sv-SE.xpi
noextract = thunderbird-i18n-128.2.1-th.xpi
noextract = thunderbird-i18n-128.2.1-tr.xpi
noextract = thunderbird-i18n-128.2.1-uk.xpi
noextract = thunderbird-i18n-128.2.1-uz.xpi
noextract = thunderbird-i18n-128.2.1-vi.xpi
noextract = thunderbird-i18n-128.2.1-zh-CN.xpi
noextract = thunderbird-i18n-128.2.1-zh-TW.xpi
options = !emptydirs
options = !makeflags
options = !lto
source = https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/source/thunderbird-128.2.1esr.source.tar.xz
source = https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/source/thunderbird-128.2.1esr.source.tar.xz.asc
source = vendor-prefs.js
source = distribution.ini
source = mozconfig.cfg
source = metainfo.patch
source = org.mozilla.Thunderbird.desktop
source = thunderbird-system-icu-74.patch
source = thunderbird-i18n-128.2.1-af.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/af.xpi
source = thunderbird-i18n-128.2.1-ar.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ar.xpi
source = thunderbird-i18n-128.2.1-ast.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ast.xpi
source = thunderbird-i18n-128.2.1-be.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/be.xpi
source = thunderbird-i18n-128.2.1-bg.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/bg.xpi
source = thunderbird-i18n-128.2.1-br.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/br.xpi
source = thunderbird-i18n-128.2.1-ca.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ca.xpi
source = thunderbird-i18n-128.2.1-cak.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/cak.xpi
source = thunderbird-i18n-128.2.1-cs.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/cs.xpi
source = thunderbird-i18n-128.2.1-cy.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/cy.xpi
source = thunderbird-i18n-128.2.1-da.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/da.xpi
source = thunderbird-i18n-128.2.1-de.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/de.xpi
source = thunderbird-i18n-128.2.1-dsb.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/dsb.xpi
source = thunderbird-i18n-128.2.1-el.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/el.xpi
source = thunderbird-i18n-128.2.1-en-GB.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/en-GB.xpi
source = thunderbird-i18n-128.2.1-en-US.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/en-US.xpi
source = thunderbird-i18n-128.2.1-es-AR.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/es-AR.xpi
source = thunderbird-i18n-128.2.1-es-ES.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/es-ES.xpi
source = thunderbird-i18n-128.2.1-et.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/et.xpi
source = thunderbird-i18n-128.2.1-eu.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/eu.xpi
source = thunderbird-i18n-128.2.1-fi.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/fi.xpi
source = thunderbird-i18n-128.2.1-fr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/fr.xpi
source = thunderbird-i18n-128.2.1-fy-NL.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/fy-NL.xpi
source = thunderbird-i18n-128.2.1-ga-IE.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ga-IE.xpi
source = thunderbird-i18n-128.2.1-gd.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/gd.xpi
source = thunderbird-i18n-128.2.1-gl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/gl.xpi
source = thunderbird-i18n-128.2.1-he.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/he.xpi
source = thunderbird-i18n-128.2.1-hr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/hr.xpi
source = thunderbird-i18n-128.2.1-hsb.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/hsb.xpi
source = thunderbird-i18n-128.2.1-hu.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/hu.xpi
source = thunderbird-i18n-128.2.1-hy-AM.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/hy-AM.xpi
source = thunderbird-i18n-128.2.1-id.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/id.xpi
source = thunderbird-i18n-128.2.1-is.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/is.xpi
source = thunderbird-i18n-128.2.1-it.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/it.xpi
source = thunderbird-i18n-128.2.1-ja.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ja.xpi
source = thunderbird-i18n-128.2.1-ka.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ka.xpi
source = thunderbird-i18n-128.2.1-kab.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/kab.xpi
source = thunderbird-i18n-128.2.1-kk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/kk.xpi
source = thunderbird-i18n-128.2.1-ko.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ko.xpi
source = thunderbird-i18n-128.2.1-lt.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/lt.xpi
source = thunderbird-i18n-128.2.1-ms.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ms.xpi
source = thunderbird-i18n-128.2.1-nb-NO.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/nb-NO.xpi
source = thunderbird-i18n-128.2.1-nl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/nl.xpi
source = thunderbird-i18n-128.2.1-nn-NO.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/nn-NO.xpi
source = thunderbird-i18n-128.2.1-pa-IN.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/pa-IN.xpi
source = thunderbird-i18n-128.2.1-pl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/pl.xpi
source = thunderbird-i18n-128.2.1-pt-BR.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/pt-BR.xpi
source = thunderbird-i18n-128.2.1-pt-PT.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/pt-PT.xpi
source = thunderbird-i18n-128.2.1-rm.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/rm.xpi
source = thunderbird-i18n-128.2.1-ro.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ro.xpi
source = thunderbird-i18n-128.2.1-ru.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/ru.xpi
source = thunderbird-i18n-128.2.1-sk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/sk.xpi
source = thunderbird-i18n-128.2.1-sl.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/sl.xpi
source = thunderbird-i18n-128.2.1-sq.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/sq.xpi
source = thunderbird-i18n-128.2.1-sr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/sr.xpi
source = thunderbird-i18n-128.2.1-sv-SE.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/sv-SE.xpi
source = thunderbird-i18n-128.2.1-th.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/th.xpi
source = thunderbird-i18n-128.2.1-tr.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/tr.xpi
source = thunderbird-i18n-128.2.1-uk.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/uk.xpi
source = thunderbird-i18n-128.2.1-uz.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/uz.xpi
source = thunderbird-i18n-128.2.1-vi.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/vi.xpi
source = thunderbird-i18n-128.2.1-zh-CN.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/zh-CN.xpi
source = thunderbird-i18n-128.2.1-zh-TW.xpi::https://archive.mozilla.org/pub/thunderbird/releases/128.2.1esr/linux-x86_64/xpi/zh-TW.xpi
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
validpgpkeys = 4360FE2109C49763186F8E21EBE41E90F6F12F6D
sha512sums = 8a04c57f7c4c8f19ca3aa5f62a65fe05944a8425e074ff49ff087c542bb64091666078ed0b887528d2662d92e65f7a00a5fad98e7897d2f1e1def963923523f0
sha512sums = SKIP
sha512sums = 6918c0de63deeddc6f53b9ba331390556c12e0d649cf54587dfaabb98b32d6a597b63cf02809c7c58b15501720455a724d527375a8fb9d757ccca57460320734
sha512sums = 5cd3ac4c94ef6dcce72fba02bc18b771a2f67906ff795e0e3d71ce7db6d8a41165bd5443908470915bdbdb98dddd9cf3f837c4ba3a36413f55ec570e6efdbb9f
sha512sums = a34dd97954f415a5ffe956ca1f10718bd164950566ceba328805c2ccbb54ed9081df07f2e063479bf932c4a443bb5b7443cca2f82eea3914465ed6e4863e0c0e
sha512sums = 7e43b1f25827ddae615ad43fc1e11c6ba439d6c2049477dfe60e00188a70c0a76160c59a97cc01d1fd99c476f261c7cecb57628b5be48874be7cf991c22db290
sha512sums = fffeb73e2055408c5598439b0214b3cb3bb4e53dac3090b880a55f64afcbc56ba5d32d1187829a08ef06d592513d158ced1fde2f20e2f01e967b5fbd3b2fafd4
sha512sums = 9897cb0ababc8e1a0001c4e1f70e0b39f5cdb9c08c69e3afd42088dfd001aa1fc6996cd83df0db1fb57ee0a80686c35c8df783108408dbe9191602cddd1e3c65
sha512sums = b4df011d615580de03296452a21012ca656b45889522bf80884a98bc3fac51f6913f34b525fc42953ee3e7ff2750c2bf6db4c0ae87c1af93f7fde709fc64b58c
sha512sums = 6d419a49791e9fee211fb3856390009326e86f99b45af0622f93a8f345abe15aba24b9c4504b905e11c96ceb267ffcbfe3e8eea9b010b55397a7ceff1156661d
sha512sums = a57f06c1053fc94d4ad860312411008aae42fe71599aeb75f7f619e8049d8f3c872b741524c86dfcfa8c7984450086c5778aa73f62a7ef76967bbc3467aba51a
sha512sums = e68ef72706ace40ec52e0f0961f96c7878bb5021e710bb820538beff2afd8582fa5b251c937346488a5d53f25a54e843993d45d1ccbb1de204b4abc7aec76831
sha512sums = d5f963301783d61f79a3a89d87f4e36f2d5e44de05937c895a1495a7d045565839efa884a75ba0de1e59e3a5b2006248ac0b02fedbbc6d8f0f9dc820da496006
sha512sums = 789e9e2960548e30e11b48578d6f3fd9333e8cb6a8447519cfe40e931bc79d4d5edd25f2a1084b62276cfe1997d4089a71a03480a7ed0d770811f0c406843596
sha512sums = e78857f22081990ec3fb23cd99734d00d6df2242723fa6e5002a27bcb4540adea4c7a164587a3b5622f8fe6ac3e27d4ddf8bc1f3c519ba256be08a3a0169e1a7
sha512sums = d141352ec32e5a22bae9054e0a1609f87454f6199f45bda581ec85d7b3208071e2edb009a96db63f4504773a0bca2948d592731d4362cc4964b23bb97aaa7dec
sha512sums = 07a416b0c33b1dcfc95b0e7086c8a44aa1424b7fbff5e9bb08c0bc23ccbc13ba4a8cb6c7d7566a12a26c78bbb670c5d2539717a5bcb6c83d9376e1f936b4038a
sha512sums = 2da1b3a314d1072c029ac00b6ef4f8bd4f23d34e69ed94255b01ba0b7932e8ec19c169efa65b730d822e4804d9419eb0aacd4ec4645f14b59b3f98a796892780
sha512sums = bea309acb790dd4e605d9fd83018d3436a76942f3a04adb546fc004a1ac30704670d69f8397cc32666a59b4180dc1320f49f945f96e17718a0f1a967a326747e
sha512sums = 8209b99caeb1807f6769efe8ac52780f25832179d6db98945c9b0cc5761ff5d7ec2c511afa359ba3bcb27ccc5f176bf761f639a8e68df8082a8615511a5cebc5
sha512sums = 665d1803cab339390b6713e9628a31008c62aec62dab9a14e77d380a507a427d51fed7969d17982ac77d2bf10621aa4dda72c1709d96415dd8d9f0793fb0e0d9
sha512sums = 9c890d99c9e56ad592860a5cc8254fc8e685f93e5e77950842aa9fceb475ad61508884ad9ee9fad83b502b5de5723f7d3d4581b93b7910b7e34af7b9c0a073f4
sha512sums = 8df247357f8275d36455f5566856c1687bb45ad36b7211111b2bb9df639cbdc7d3ad32ef32fdbe5178ec7ffdebfcc6fb73854bd26892119adea09221f977b5e0
sha512sums = a55550b91442b9e2f76e424d0f79ea67c401d1e41279cd891f437b5f38b2cb58893c176eccb19c921e74bc664579f52656ba381b4a94aec598ee218ee7c154eb
sha512sums = 1d8c48570c62db60961308c401baced3f7a4b533c3cfd482760c33a736b647144bd674ec56ff0ab68eccf0144924218fcdb4b1169b0bbf68f46e059a748d242d
sha512sums = f81ba9665788c67cdf607b1d381fd5e55306e8796e4879c9a8ac86a1fc252ae8f574706cc59b86547d30db38a7e3c3c73fb1d2165170dea11507ce052815cf8f
sha512sums = 766771bd0036b80c201d8a4bf2328f14eb3f78f5e9cc128d82d48463803dd1e1bc91d74a92a98b0f9b37bdabee921d412b4844e75974c187f6ee8dd3ff78b4a7
sha512sums = 5b6f0770ac7d190aeff30bc177379aa5a7bdab682d9ce3944aec5215eec3b67bb807f0fb3d534c531619b7e81a494d16632be7b01e50dfbad862c82164da3364
sha512sums = 15cacb9af1a626a7fdeefbe78c68fd9296a8743651f2a4a9c9b7e3fd9daab72166cf6f596835a9372dd5240789badce0ea46e4d4f657598660f25576c6f15ae4
sha512sums = bf338e98d6a1ca32f835e45d4557f4d9eb4d9de7ac7e5d73d241d5b24dd385427df4a37d0df518e4406f2d1badf93ccfbf0590b35ce1a9990d06deaa34ef70d2
sha512sums = 0a29b05cdc6e282ab945007370cd56bd96f8f5e78c24b327ddf41e4abbf981ba595b06b1da81c63cb3b34478138f7a9abb83352e5bd1f098fb505a93bed2ec8f
sha512sums = fe2336002759657610d0afacf53eb4b071da742a0db53c511ad45721eb2616377012ba1376994980752209aa984d466db6322cb143d28223b2f076308dd4a910
sha512sums = 5e95eb3ae53a81e9577bf0018e37e3c48208683bde3731b823207b5ccc9bb28445d2cac05104a14c8c99105918d70baa9470e59bdd3cb13aa13f04f5e481dbc7
sha512sums = 4f5d2abaf85d9beb3688f6765ccf46de53de76b26cf538ab598070a6614976cb3e2ddc98ee12972cbc84fa20bd71e7906938bb92717a8b4221ec4331b7390a26
sha512sums = 609064139d4c03fa59eb3a5879f40fabfcf49cfcac3a5f0d6445116b625e255b8e000a008803dbb859d2613525f20a30383233979c1fa50d4a1d6fd6831c9c07
sha512sums = 2ccdda7f559a9ae2b36fd8b6b307ec058f8e657ba8261034f0c1c94f24641b7abd5184a088b858ee2ace635ac71f319b24bec237965209fbee0fc969b0b27b6d
sha512sums = b9d9e057eec2c2d7987e5bf23ee73c1091f15373ffd405b1fef3bf0b403a0018f8496bccf599283b67fb9f7e896b120746c574a2033e544e54b97716ff6794d6
sha512sums = 1934e9090abaf8e2ab0c6d0f9dc328e04a6643908f8c15422115d9408f7915e30bb300813ae49abfa800fd765b126fca44b9e082a5e5fe39c0019d15dfda3a2e
sha512sums = 914cb10a12a9b486d46955cac8c4dbbd1ad5a3c4afe6a3ebf4d3f593b90c5a7e8541ba4f98d079f5680a62b01c5ee50f7b4e84f30f9e214e1381d1cc45bd1531
sha512sums = 8ca188e30c781b0bacf564ebc76d60360102152ad9c53128136fe09f8d4feef395a4c05ab5a8851ef011a9650c3aaa80e2e97f99341e72c3bf016299f7475dfb
sha512sums = bc59bc564522d4a1d6603114d66744762369c011c735a71959f80c5c568491ee5c6e81f30a655defe59b3f4ff21efad1dc6dda7b92487615c51a41078fe9126e
sha512sums = 6345b513959a45f9963eddcc716ebc22b02545d565a283bf6e48ae19a98f67ea6403abd1e9154e319145761b3e88f97a5bb682fc01bbc11e1f527e013b65dc6e
sha512sums = 8f96304191f9f3f0780a184950bf4ee031fc7e768beadccd114a4e4a24fdee9353e7c3e134e139acf129c59d317abf544dee325f087cf0c5462b9ec5cc418e6b
sha512sums = 5be26bdd75362aae33a9f77bd772caf34f67fbc98a90dcf3a17d215d6f40d382ac04fb0a5af99aff16d7d207e45e5b4fe9e53f368ce578e696adeaeb7564a44a
sha512sums = 1d79709a7a8c7171129a64093bde5263e2c35c17a4c99d0efa8e7e0f4f8d65d525d45e17ed51e7633ece13b46a0283c3b81a14d6ec72af046cfd311be6ea8614
sha512sums = 582527b1aa96a9bffb00fc8b5b09de677268405b074a9f43aa47c29513c0110c22fc6b5f528e739d447b2556065c5e338635cb71bcb6c504be29d86adc8a3bc5
sha512sums = 2d95d891f8b99ba68eba67e3b54c2bdc440de4c8c5aa27d745cfdf96c1ab843b1cb24db736e85aef3c82d6b18ae1c339a0e0aa7617031314f3f934f25f5ff07b
sha512sums = fdc8943bcfc112676fb4211853eb2a33ff8a33488e55b01473214b75e33c18ffea7e3340cc291653260101eb2c3cfa1dcb45487b5f8406595d7d948b8852632d
sha512sums = c6eaddc26b9ce6a8f71959878c43c59816cc8141c188859d1286a5656aed0c0f13fd73aa6e33996fe9e5f63d998cd04b40af6145c88f8f2d9ccff31e43cabce7
sha512sums = c72fdfb6b96929f978f4bf21f025a69e84ac9b1ca88b6aff8e1a5bc8d78a8dd3e680686133ba017f63b527e3b3e184a6612ec977ed94f65e478c04b30a1dfc44
sha512sums = a47fb34784617bb904a58dd521c6c994489ddc2f1352f56f40f8a4d787ecc3e3e085e5d85fb74b49a3d769f21b20d9cf82e24cbb48dc84c7e74c4fa10a8bd2fe
sha512sums = 6a78180385a8589a732f154d59114db64e50abdcf3a30c227861d1352f6a70cf3b899ea38d3a2f1a777ee551a17a41db9852055dd9debe79649ba6843f58a679
sha512sums = ff3b7f2c167f4712020f4ee36dbbd25c26549ca2a0a7889bbf5f8815028233183ef87bf6080ed89010fcf6ca3944b5d964dcde74de85045dac85c9152b1e537f
sha512sums = 92aa91dc7c2dcd8f340992e0abfa8089495dd6e4108be22b5bb2972e3a9a0f034f39502048f0b5c5568b6db01fa0360dde8a844ac315e7e66ac08754fa14aa4b
sha512sums = b1b5812baa54eae0362676d4c5b3c25197c85d3822461fc40b46646d706a194fa73e5730f993f1978e9de7258e684bee09201530b70341b9a1be89dd02cd5d54
sha512sums = 9165ba22ec09aa949a442a3d6b8275dbebe67674b1c930267d9cc12c2270f345488bdbae7f32a9098182650112bab32a9cf4ae7c22accb6b358f8b9e2f06aab6
sha512sums = b72e65bc157dcefba8577998dc916f334226d98e8d7bb1897d48fccc571c807797d6f675742459c586d18575290e68ac924c765f49b45bbb59cdd6a17782373e
sha512sums = 993952740d99f2f1f896d856c738a926d8320d05b33f514f25e5bbf879c24317c0f51dc979f06078ec8fb68624fc125835792f1a6246f78045de7bda08d1448b
sha512sums = a132dd16295f4880009db20d56d1cd785a8c018969969b207dc1771bbc111ce1b8abfdb23dc7e3f6319690bda5b1f9707d07885a4d6bda3353ce574de02c562a
sha512sums = 0240b86e82d5ad761a006131b033ab40c836ffa0cb95b30f8301972c8a4a48ada0bf495571151f74a93f2d433b86c63c69ed436c826d994d9d599c45d4521931
sha512sums = 7236c4ccc161ff6551b14bf83efa218936ff9a59053db317f48477f509537bdb78777d5dac4a72a84670cb3015795327116acbe9a8ead2689c852762a5054b32
sha512sums = 5401ff6040bd50e1f53fc02621471aec876c5a54798c96a1088e416057a0112e23420dd0997e74e21c7961471b82ed0c6153090632724160aa3745e56ec8bf47
sha512sums = 87eaa384d0aab2de44157ec239bf87a5b5f2ae1a5d9036311dc887e97b63803621420a66a6be9a569084511593f570eb1019db83743357628fa2fb0726b83a22
sha512sums = 3412d1bee9bfc153be5c8c6c0c015d6fa3fa6d4d4c901ca914b0aee75aacb3648a1eb7dc77916d521d038f9220c80924859997f3bf9226e0726d330c7f91f5a5
sha512sums = 6f4ca7656ecf67a137f618e8bb6ab2a817968b1844a41d109d98bc665125ec68e5e007fbe7b76a28db8082b9c13659d82b3e31b82bbe27b0e6596fb799f95000
sha512sums = 98b5514915baba99cd2e060d3d91ac423147925aa6469a619b11f6a044e9ebeec8f57d7cdb220e034730cc496cda74664e0c5f07d9f326747c04a52f3eb82590
sha512sums = c33087e527575533563fd154808c364701c7b0dfbe512597206b6cbf086b6fc62b0757f7c0efe191edd7178609444c39a5626f39851d118205570eaf8bb9ef94
sha512sums = c5df80c44f719964e00143b5fb6347c447907b936b0d4e8900d01127ed13d86be4367aa63b688666028a9908706677b7e89fb239f61110195382f3623477791c
sha512sums = 1caf0e8bd087531c373225bb54f30a49b3274a30a3e220e81bb2746b6fbf71ad18c50a36f644c90c02045eeaa14c54213429fb69c87b6bc2ec7fd91353e43b31
sha512sums = 641c7296e86a859061116e7b5c9f0077d6dc02e1c81212c21ce0247e9e92a88f3d7fa2be307f717e6f95077c29c236487dc8fd93d7f9795aba569e36f9f5f1dc
sha512sums = 6e8c435ed7f07b1dd1b201730049aeb924a7b1b44ae2fa9ed1a209e7862abd0316845c929fea24f73e43262f147b7e092bfe26ed7f3d2914c09bc60f160ccd98
pkgname = thunderbird
optdepends = hunspell-en_us: Spell checking, American English
optdepends = libotr: OTR support for active one-to-one chats
optdepends = libnotify: Notification integration
pkgname = thunderbird-i18n-af
pkgname = thunderbird-i18n-ar
pkgname = thunderbird-i18n-ast
pkgname = thunderbird-i18n-be
pkgname = thunderbird-i18n-bg
pkgname = thunderbird-i18n-br
pkgname = thunderbird-i18n-ca
pkgname = thunderbird-i18n-cak
pkgname = thunderbird-i18n-cs
pkgname = thunderbird-i18n-cy
pkgname = thunderbird-i18n-da
pkgname = thunderbird-i18n-de
pkgname = thunderbird-i18n-dsb
pkgname = thunderbird-i18n-el
pkgname = thunderbird-i18n-en-gb
pkgname = thunderbird-i18n-en-us
pkgname = thunderbird-i18n-es-ar
pkgname = thunderbird-i18n-es-es
pkgname = thunderbird-i18n-et
pkgname = thunderbird-i18n-eu
pkgname = thunderbird-i18n-fi
pkgname = thunderbird-i18n-fr
pkgname = thunderbird-i18n-fy-nl
pkgname = thunderbird-i18n-ga-ie
pkgname = thunderbird-i18n-gd
pkgname = thunderbird-i18n-gl
pkgname = thunderbird-i18n-he
pkgname = thunderbird-i18n-hr
pkgname = thunderbird-i18n-hsb
pkgname = thunderbird-i18n-hu
pkgname = thunderbird-i18n-hy-am
pkgname = thunderbird-i18n-id
pkgname = thunderbird-i18n-is
pkgname = thunderbird-i18n-it
pkgname = thunderbird-i18n-ja
pkgname = thunderbird-i18n-ka
pkgname = thunderbird-i18n-kab
pkgname = thunderbird-i18n-kk
pkgname = thunderbird-i18n-ko
pkgname = thunderbird-i18n-lt
pkgname = thunderbird-i18n-ms
pkgname = thunderbird-i18n-nb-no
pkgname = thunderbird-i18n-nl
pkgname = thunderbird-i18n-nn-no
pkgname = thunderbird-i18n-pa-in
pkgname = thunderbird-i18n-pl
pkgname = thunderbird-i18n-pt-br
pkgname = thunderbird-i18n-pt-pt
pkgname = thunderbird-i18n-rm
pkgname = thunderbird-i18n-ro
pkgname = thunderbird-i18n-ru
pkgname = thunderbird-i18n-sk
pkgname = thunderbird-i18n-sl
pkgname = thunderbird-i18n-sq
pkgname = thunderbird-i18n-sr
pkgname = thunderbird-i18n-sv-se
pkgname = thunderbird-i18n-th
pkgname = thunderbird-i18n-tr
pkgname = thunderbird-i18n-uk
pkgname = thunderbird-i18n-uz
pkgname = thunderbird-i18n-vi
pkgname = thunderbird-i18n-zh-cn
pkgname = thunderbird-i18n-zh-tw

View File

@ -0,0 +1,4 @@
[thunderbird]
source = "jq"
url = "https://product-details.mozilla.org/1.0/thunderbird_versions.json"
filter = ".LATEST_THUNDERBIRD_VERSION"

View File

@ -1,46 +0,0 @@
diff -Naur a/js/src/old-configure.in b/js/src/old-configure.in
--- a/js/src/old-configure.in 2023-06-06 11:04:10.782830435 +0300
+++ b/js/src/old-configure.in 2023-06-06 11:05:30.197519064 +0300
@@ -233,19 +233,6 @@
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
- # While sha1 is deterministic, it is slower.
- if test -z "$DEVELOPER_OPTIONS"; then
- build_id=sha1
- else
- build_id=uuid
- fi
- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
- LDFLAGS=$_SAVE_LDFLAGS)
-
_DEFINES_CFLAGS="-include $jsconfdefs -DMOZILLA_CLIENT"
fi
diff -Naur a/old-configure.in b/old-configure.in
--- a/old-configure.in 2023-06-06 11:04:08.354778655 +0300
+++ b/old-configure.in 2023-06-06 11:05:45.108835132 +0300
@@ -239,19 +239,6 @@
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
- # While sha1 is deterministic, it is slower.
- if test -z "$DEVELOPER_OPTIONS"; then
- build_id=sha1
- else
- build_id=uuid
- fi
- AC_MSG_CHECKING([for --build-id=$build_id option to ld])
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,--build-id=$build_id"
- AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
- LDFLAGS=$_SAVE_LDFLAGS)
-
AC_MSG_CHECKING([for --ignore-unresolved-symbol option to ld])
HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
_SAVE_LDFLAGS=$LDFLAGS

View File

@ -1,11 +0,0 @@
diff -Naur a/config/system-headers.mozbuild b/config/system-headers.mozbuild
--- a/config/system-headers.mozbuild 2023-07-04 13:57:53.418421221 +0300
+++ b/config/system-headers.mozbuild 2023-07-04 13:58:41.177179152 +0300
@@ -227,7 +227,6 @@
'execinfo.h',
'extras.h',
'fcntl.h',
- 'features.h',
'fenv.h',
'ffi.h',
'fibdef.h',

View File

@ -1,175 +0,0 @@
Allow building against system-wide harfbuzz.
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=847568
---
config/system-headers.mozbuild | 7 +++++++
dom/base/moz.build | 3 +++
gfx/moz.build | 4 +++-
gfx/skia/generate_mozbuild.py | 3 +++
gfx/skia/moz.build | 3 +++
gfx/thebes/moz.build | 3 +++
intl/unicharutil/util/moz.build | 3 +++
netwerk/dns/moz.build | 3 +++
toolkit/library/moz.build | 3 +++
toolkit/moz.configure | 9 +++++++++
10 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
index d9489c8..9c0ea64 100644
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1235,6 +1235,13 @@ if CONFIG['OS_TARGET'] == 'Android':
'vr/gvr/capi/include/gvr.h',
]
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ system_headers += [
+ 'harfbuzz/hb-glib.h',
+ 'harfbuzz/hb-ot.h',
+ 'harfbuzz/hb.h',
+ ]
+
if CONFIG['MOZ_JACK']:
system_headers += [
'jack/jack.h',
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 1479761..610ca80 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -613,6 +613,9 @@ FINAL_LIBRARY = "xul"
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
+
GeneratedFile(
"UseCounterList.h",
script="gen-usecounters.py",
diff --git a/gfx/moz.build b/gfx/moz.build
index 56ea317..6cc19f8 100644
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -10,6 +10,9 @@ with Files("**"):
with Files("wr/**"):
BUG_COMPONENT = ("Core", "Graphics: WebRender")
+if not CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ DIRS += ["harfbuzz/src"]
+
DIRS += [
"cairo",
"2d",
@@ -20,7 +23,6 @@ DIRS += [
"gl",
"layers",
"graphite2/src",
- "harfbuzz/src",
"ots/src",
"thebes",
"ipc",
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
index 39675ea..6262eec 100755
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -91,6 +91,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
'-Wno-unused-private-field',
]
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
LOCAL_INCLUDES += [
"/gfx/cairo/cairo/src",
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 1d92936..afef373 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -601,6 +601,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
'-Wno-unused-private-field',
]
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
LOCAL_INCLUDES += [
"/gfx/cairo/cairo/src",
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 7190375..8af85a4 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -294,6 +294,9 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
DEFINES["GRAPHITE2_STATIC"] = True
+if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
+
CXXFLAGS += ["-Werror=switch"]
include("/tools/fuzzing/libfuzzer-config.mozbuild")
diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
index 2bbd004..f66bd37 100644
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -24,6 +24,9 @@ UNIFIED_SOURCES += [
"nsUnicodeProperties.cpp",
]
+if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
+
include("/ipc/chromium/chromium-config.mozbuild")
GeneratedFile(
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
index 17612ff..d6d5194 100644
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -109,4 +109,7 @@ LOCAL_INCLUDES += [
"/netwerk/protocol/http",
]
+if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
+
USE_LIBS += ["icu"]
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 0f9d7e9..a6c079d 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -291,6 +291,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
"-lgvr",
]
+if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
+ OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
+
if CONFIG["MOZ_SYSTEM_JPEG"]:
OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index e76c9b2..0e00098 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -650,6 +650,15 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
set_define("MOZ_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True))
+# HarfBuzz
+# ==============================================================
+option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)")
+
+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.7.4',
+ when='--with-system-harfbuzz')
+
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
+
# Apple platform decoder support
# ==============================================================
@depends(toolkit)
--
2.34.1

View File

@ -1,208 +0,0 @@
From a7761d4886498eaa0e83d1c9b4399632cdbf314e Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Mon, 6 Apr 2020 19:34:44 +0200
Subject: [PATCH 05/30] bmo#847568: Support system graphite2
Allow building against system-wide graphite2.
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=847568
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
config/system-headers.mozbuild | 6 ++++++
gfx/graphite2/geckoextra/moz.build | 21 +++++++++++++++++++++
gfx/graphite2/moz-gr-update.sh | 7 ++++++-
gfx/moz.build | 6 +++++-
gfx/thebes/moz.build | 5 ++++-
old-configure.in | 21 +++++++++++++++++++++
toolkit/library/moz.build | 3 +++
toolkit/moz.configure | 13 +++++++++++++
8 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 gfx/graphite2/geckoextra/moz.build
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
index 9c0ea64..0f4b24a 100644
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1242,6 +1242,12 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
'harfbuzz/hb.h',
]
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+ system_headers += [
+ 'graphite2/Font.h',
+ 'graphite2/Segment.h',
+ ]
+
if CONFIG['MOZ_JACK']:
system_headers += [
'jack/jack.h',
diff --git a/gfx/graphite2/geckoextra/moz.build b/gfx/graphite2/geckoextra/moz.build
new file mode 100644
index 0000000..24e8d7a
--- /dev/null
+++ b/gfx/graphite2/geckoextra/moz.build
@@ -0,0 +1,21 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXPORTS.graphite2 += [
+ 'include/GraphiteExtra.h',
+ 'include/GraphiteStructsForRLBox.h',
+]
+
+UNIFIED_SOURCES += [
+ '../geckoextra/src/GraphiteExtra.cpp',
+]
+
+CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
+
+# Match bundled graphite2 configuration
+AllowCompilerWarnings()
+
+FINAL_LIBRARY = 'gkmedias'
diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
index b91d9c1..a97e6eb 100755
--- a/gfx/graphite2/moz-gr-update.sh
+++ b/gfx/graphite2/moz-gr-update.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# Script used to update the Graphite2 library in the mozilla source tree
+# and bump version for --with-system-graphite2
# This script lives in gfx/graphite2, along with the library source,
# but must be run from the top level of the mozilla-central tree.
@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
+# chase version for --with-system-graphite2
+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
+ if /GR2_VERSION_REQUIRE/" old-configure.in
+
# summarize what's been touched
echo Updated to $RELEASE.
echo Here is what changed in the gfx/graphite2 directory:
echo
-hg stat gfx/graphite2
+hg stat old-configure.in gfx/graphite2
echo
echo If gfx/graphite2/src/files.mk has changed, please make corresponding
diff --git a/gfx/moz.build b/gfx/moz.build
index 6cc19f8..14b08db 100644
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -10,6 +10,11 @@ with Files("**"):
with Files("wr/**"):
BUG_COMPONENT = ("Core", "Graphics: WebRender")
+if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
+ DIRS += ["graphite2/geckoextra"]
+else:
+ DIRS += ["graphite2/src"]
+
if not CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
DIRS += ["harfbuzz/src"]
@@ -22,7 +27,6 @@ DIRS += [
"qcms",
"gl",
"layers",
- "graphite2/src",
"ots/src",
"thebes",
"ipc",
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 8af85a4..239579c 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -292,7 +292,10 @@ if CONFIG["MOZ_WAYLAND"]:
LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
-DEFINES["GRAPHITE2_STATIC"] = True
+if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
+ CXXFLAGS += CONFIG["MOZ_GRAPHITE2_CFLAGS"]
+else:
+ DEFINES["GRAPHITE2_STATIC"] = True
if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
diff --git a/old-configure.in b/old-configure.in
index ada50d1..1fa87df 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1162,6 +1162,27 @@ fi
AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID)
AC_SUBST(MOZ_MACBUNDLE_ID)
+dnl ========================================================
+dnl Check for graphite2
+dnl ========================================================
+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
+ dnl graphite2.pc has bogus version, check manually
+ _SAVE_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS"
+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \
+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
+ * 100 + GR2_VERSION_BUGFIX >= \
+ (major) * 10000 + (minor) * 100 + (bugfix) )
+ ], [
+ #if !GR2_VERSION_REQUIRE(1,3,8)
+ #error "Insufficient graphite2 version."
+ #endif
+ ], [],
+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
+ CFLAGS=$_SAVE_CFLAGS
+fi
+
dnl ========================================================
dnl = Child Process Name for IPC
dnl ========================================================
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index a6c079d..32c8208 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -291,6 +291,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
"-lgvr",
]
+if CONFIG["MOZ_SYSTEM_GRAPHITE2"]:
+ OS_LIBS += CONFIG["MOZ_GRAPHITE2_LIBS"]
+
if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 0e00098..a9d3633 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -650,6 +650,19 @@ def freetype2_combined_info(fontconfig_info, freetype2_info):
set_define("MOZ_HAVE_FREETYPE2", depends_if(freetype2_info)(lambda _: True))
+# Graphite2
+# ==============================================================
+option('--with-system-graphite2', help="Use system graphite2 (located with pkgconfig)")
+
+@depends('--with-system-graphite2')
+def check_for_graphite2(value):
+ return bool(value)
+
+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
+ when=check_for_graphite2)
+
+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
+
# HarfBuzz
# ==============================================================
option('--with-system-harfbuzz', help="Use system harfbuzz (located with pkgconfig)")
--
2.34.1

View File

@ -1,114 +0,0 @@
From 8a4627c0c910415b00bebeb976dc6ea8c3e0d5d0 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Mon, 6 Apr 2020 19:36:02 +0200
Subject: [PATCH 06/30] bmo#1559213: Support system av1
Allow building against system-wide av1.
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1559213
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
config/external/moz.build | 5 +++--
config/system-headers.mozbuild | 8 ++++++++
dom/media/platforms/moz.build | 5 +++++
toolkit/moz.configure | 20 ++++++++++++++++++--
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/config/external/moz.build b/config/external/moz.build
index ab771212bf..75595d999c 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -49,8 +49,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
external_dirs += ["media/libvpx"]
if CONFIG["MOZ_AV1"]:
- external_dirs += ["media/libaom"]
- external_dirs += ["media/libdav1d"]
+ if not CONFIG["MOZ_SYSTEM_AV1"]:
+ external_dirs += ["media/libaom"]
+ external_dirs += ["media/libdav1d"]
if not CONFIG["MOZ_SYSTEM_PNG"]:
external_dirs += ["media/libpng"]
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
index 2f7ae39515..96ab3a6466 100644
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1301,6 +1301,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
'proxy.h',
]
+if CONFIG['MOZ_SYSTEM_AV1']:
+ system_headers += [
+ 'aom/aom_decoder.h',
+ 'aom/aomdx.h',
+ 'aom/aom_image.h',
+ 'dav1d/dav1d.h',
+ ]
+
if CONFIG['MOZ_SYSTEM_LIBVPX']:
system_headers += [
'vpx_mem/vpx_mem.h',
diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
index 8509aec6ef..7c5a1df63d 100644
--- a/dom/media/platforms/moz.build
+++ b/dom/media/platforms/moz.build
@@ -78,6 +78,11 @@ if CONFIG["MOZ_AV1"]:
"agnostic/AOMDecoder.cpp",
"agnostic/DAV1DDecoder.cpp",
]
+ if CONFIG["MOZ_SYSTEM_AV1"]:
+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBAOM_LIBS"]
+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBDAV1D_CFLAGS"]
+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBDAV1D_LIBS"]
if CONFIG["MOZ_OMX"]:
EXPORTS += [
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index a68e1b347d..7b7975bd12 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -544,14 +544,29 @@ def av1(value):
if value:
return True
+option("--with-system-av1", help="Use system av1 (located with pkg-config)")
-@depends(target, when=av1 & compile_environment)
+system_libaom_info = pkg_check_modules('MOZ_SYSTEM_LIBAOM', 'aom >= 1.0.0',
+ when='--with-system-av1')
+
+system_libdav1d_info = pkg_check_modules('MOZ_SYSTEM_LIBDAV1D', 'dav1d >= 0.1.1',
+ when='--with-system-av1')
+
+@depends(system_libaom_info, system_libdav1d_info)
+def system_av1(system_libaom_info, system_libdav1d_info):
+ has_av1_libs = False
+ if system_libaom_info and system_libdav1d_info:
+ has_av1_libs = True
+ return has_av1_libs
+
+
+@depends(target, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment)
def dav1d_asm(target):
if target.cpu in ("aarch64", "x86", "x86_64"):
return True
-@depends(target, when=av1 & compile_environment)
+@depends(target, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment)
def dav1d_nasm(target):
if target.cpu in ("x86", "x86_64"):
return namespace(version="2.14", what="AV1")
@@ -561,6 +576,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
set_define("MOZ_DAV1D_ASM", dav1d_asm)
set_config("MOZ_AV1", av1)
set_define("MOZ_AV1", av1)
+set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True))
# JXL Image Codec Support
# ==============================================================
--
2.34.1

View File

@ -1,35 +0,0 @@
From d8ec0bd6f3b0ad2dfd8a97a864f08decaafdea69 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sun, 8 Jan 2017 19:16:38 -0600
Subject: [PATCH 10/30] musl: Add alternate name for private siginfo struct
member
musl does not provide a macro for detecting its presence. For now,
assume that it is the only non-glibc-based libc on Linux systems.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
index 9884be8bb2..86d8f88e30 100644
--- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
+++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc
@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
// If the version of glibc doesn't include this information in
// siginfo_t (older than 2.17), we need to explicitly copy it
// into an arch_sigsys structure.
- memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
+#if defined(__GLIBC__)
+ memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
+#else
+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
+#endif
#endif
#if defined(__mips__)
--
2.34.1

View File

@ -1,42 +0,0 @@
From 1b46c0fc085fe93c36320d7ac1004c83efccdccc Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sun, 8 Jan 2017 19:19:23 -0600
Subject: [PATCH 11/30] musl: Fix syscall wrappers
musl defines p{read,write}64 to their non-suffixed equivalents to avoid
duplication in its syscall wrappers. This breaks macro expansion here,
leading to errors such as:
In function size_t sys_pread64(int, void*, size_t, off_t):
error: '__NR_pread' was not declared in this scope
The fix here is to undefine the p{read,write}64 macros, so the syscall
expands to (e.g.) __NR_pread64 instead.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
.../src/third_party/lss/linux_syscall_support.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
index 1abe0ba5b0..d6087a1674 100644
--- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
@@ -173,6 +173,13 @@ extern "C" {
# undef __NR_waitpid
#endif
+#ifdef pread64
+#undef pread64
+#endif
+#ifdef pwrite64
+#undef pwrite64
+#endif
+
/* As glibc often provides subtly incompatible data structures (and implicit
* wrapper functions that convert them), we provide our own kernel data
* structures for use by the system calls.
--
2.34.1

View File

@ -1,33 +0,0 @@
From 68dd87a3dc06cf59396dccc3e031761f7237656e Mon Sep 17 00:00:00 2001
From: "Jory A. Pratt" <anarchy@gentoo.org>
Date: Mon, 6 Apr 2020 20:09:26 +0200
Subject: [PATCH 12/30] musl: Only use system heap reporter with glibc
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
xpcom/base/nsMemoryReporterManager.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index bd4629c785..b513f81216 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -647,6 +647,7 @@ static bool InSharedRegion(mach_vm_address_t aAddr, cpu_type_t aType) {
return NS_OK;
}
+#ifdef __GLIBC__
# define HAVE_SYSTEM_HEAP_REPORTER 1
// Windows can have multiple separate heaps, but we should not touch non-default
// heaps because they may be destroyed at anytime while we hold a handle. So we
@@ -679,6 +680,7 @@ static bool InSharedRegion(mach_vm_address_t aAddr, cpu_type_t aType) {
*aSizeOut = heapSize;
return NS_OK;
}
+#endif
struct SegmentKind {
DWORD mState;
--
2.34.1

View File

@ -1,29 +0,0 @@
From 70d47d18420fe9e3de8f896c08f97ef2596c9c84 Mon Sep 17 00:00:00 2001
From: "Jory A. Pratt" <anarchy@gentoo.org>
Date: Mon, 6 Apr 2020 20:10:03 +0200
Subject: [PATCH 13/30] musl: Set pthread name for non glibc systems
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
js/src/threading/posix/PosixThread.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/js/src/threading/posix/PosixThread.cpp b/js/src/threading/posix/PosixThread.cpp
index 35532e375b..983da45326 100644
--- a/js/src/threading/posix/PosixThread.cpp
+++ b/js/src/threading/posix/PosixThread.cpp
@@ -115,8 +115,10 @@ void ThisThread::SetName(const char* name) {
rv = 0;
#elif defined(__NetBSD__)
rv = pthread_setname_np(pthread_self(), "%s", (void*)name);
-#else
+#elif defined(__GLIBC__)
rv = pthread_setname_np(pthread_self(), name);
+#else
+ rv = 0;
#endif
MOZ_RELEASE_ASSERT(!rv);
}
--
2.34.1

View File

@ -1,51 +0,0 @@
From beed745f96bbc18a3c22a728095c9a2eef7435ee Mon Sep 17 00:00:00 2001
From: "Jory A. Pratt" <anarchy@gentoo.org>
Date: Mon, 6 Apr 2020 20:12:09 +0200
Subject: [PATCH 15/30] musl: sys/auvx.h avaliable on more then just glibc
systems
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
.../system_wrappers/source/cpu_features_linux.cc | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
index 335bed4da3..c2c98dae8a 100644
--- a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
+++ b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
@@ -12,13 +12,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef __GLIBC_PREREQ
-#define WEBRTC_GLIBC_PREREQ(a, b) __GLIBC_PREREQ(a, b)
-#else
-#define WEBRTC_GLIBC_PREREQ(a, b) 0
-#endif
-
-#if WEBRTC_GLIBC_PREREQ(2, 16)
+#if defined(__linux__)
#include <sys/auxv.h>
#else
#include <errno.h>
@@ -40,7 +34,7 @@ uint64_t GetCPUFeaturesARM(void) {
int architecture = 0;
uint64_t hwcap = 0;
const char* platform = NULL;
-#if WEBRTC_GLIBC_PREREQ(2, 16)
+#if defined(__linux__)
hwcap = getauxval(AT_HWCAP);
platform = (const char*)getauxval(AT_PLATFORM);
#else
@@ -64,7 +58,7 @@ uint64_t GetCPUFeaturesARM(void) {
}
close(fd);
}
-#endif // WEBRTC_GLIBC_PREREQ(2, 16)
+#endif // (__linux__)
#if defined(__aarch64__)
architecture = 8;
if ((hwcap & HWCAP_FP) != 0)
--
2.34.1

View File

@ -1,28 +0,0 @@
From 6d36ed9e971861321bb381e25516500069314eb6 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 1 May 2020 17:20:29 +0200
Subject: [PATCH 16/30] musl: make SYS_fork non-fatal, musl uses it for fork(2)
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
security/sandbox/linux/SandboxFilter.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
index eb72d944c8..8ce22d6f65 100644
--- a/security/sandbox/linux/SandboxFilter.cpp
+++ b/security/sandbox/linux/SandboxFilter.cpp
@@ -1537,6 +1537,10 @@ class ContentSandboxPolicy : public SandboxPolicyCommon {
// usually do something reasonable on error.
case __NR_clone:
return ClonePolicy(Error(EPERM));
+# ifdef __NR_fork
+ case __NR_fork:
+ return Error(ENOSYS);
+# endif
case __NR_clone3:
return Error(ENOSYS);
--
2.34.1

View File

@ -1,33 +0,0 @@
From 45d43bb2dc1c1c033c860951c93261e98647f851 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Mon, 6 Apr 2020 20:13:34 +0200
Subject: [PATCH 18/30] Make PGO use toolchain
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
build/unix/mozconfig.unix | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
index 9ca9c97fce..9f86fe0940 100644
--- a/build/unix/mozconfig.unix
+++ b/build/unix/mozconfig.unix
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
+ if [ -n "$MOZ_PGO" ]; then
+ if [ -z "$USE_ARTIFACT" ]; then
+ ac_add_options --enable-lto
+ fi
+ export AR="$topsrcdir/gcc/bin/gcc-ar"
+ export NM="$topsrcdir/gcc/bin/gcc-nm"
+ export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
+ fi
+
# We want to make sure we use binutils and other binaries in the tooltool
# package.
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
--
2.34.1

View File

@ -1,24 +0,0 @@
diff -Naur a/build/moz.configure/warnings.configure b/build/moz.configure/warnings.configure
--- a/build/moz.configure/warnings.configure 2022-10-10 19:05:25.000000000 +0300
+++ b/build/moz.configure/warnings.configure 2022-10-18 13:59:24.514026407 +0300
@@ -160,6 +160,9 @@
# false positives depending on optimization
check_and_add_warning("-Wno-error=array-bounds")
+# can't get rid of those PGO warnings
+check_and_add_warning("-Wno-error=coverage-mismatch")
+
# false positives depending on optimizations
check_and_add_warning("-Wno-error=free-nonheap-object")
@@ -279,8 +282,8 @@
# build, but we're not sure why.
check_and_add_warning("-Wno-enum-compare")
-# Make it an error to be missing function declarations for C code.
-check_and_add_warning("-Werror=implicit-function-declaration", c_compiler)
+check_and_add_warning("-Werror=implicit-function-declaration",
+ when="--enable-warnings-as-errors")
# New in clang 11. We can't really do anything about this warning.
check_and_add_warning("-Wno-psabi")

View File

@ -1,34 +0,0 @@
From 685e82ac82921720c6cd9c6c45703ff034f081e7 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sat, 29 Aug 2020 22:30:59 +0200
Subject: [PATCH 25/30] LTO: Only enable LTO for Rust when complete build uses
LTO
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
config/makefiles/rust.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index 75570d32b9..924722a506 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -87,6 +87,7 @@ endif
# These flags are passed via `cargo rustc` and only apply to the final rustc
# invocation (i.e., only the top-level crate, not its dependencies).
cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
+ifdef MOZ_LTO
ifndef DEVELOPER_OPTIONS
ifndef MOZ_DEBUG_RUST
# Enable link-time optimization for release builds, but not when linking
@@ -106,6 +107,7 @@ endif
endif
endif
endif
+endif
ifdef CARGO_INCREMENTAL
export CARGO_INCREMENTAL
--
2.34.1

View File

@ -1,23 +0,0 @@
Enable FLAC on platforms without ffvpx like powerpc*
--- a/dom/media/flac/FlacDecoder.cpp
+++ b/dom/media/flac/FlacDecoder.cpp
@@ -7,6 +7,7 @@
#include "FlacDecoder.h"
#include "MediaContainerType.h"
#include "mozilla/StaticPrefs_media.h"
+#include "PDMFactory.h"
namespace mozilla {
@@ -14,6 +15,10 @@ namespace mozilla {
bool FlacDecoder::IsEnabled() {
#ifdef MOZ_FFVPX
return StaticPrefs::media_flac_enabled();
+#elif defined(MOZ_FFMPEG)
+ RefPtr<PDMFactory> platform = new PDMFactory();
+ return StaticPrefs::media_flac_enabled() &&
+ (platform->SupportsMimeType("audio/flac"_ns) != media::DecodeSupport::Unsupported);
#else
return false;
#endif

View File

@ -1,16 +0,0 @@
diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h
index 51d79f9c2ec59..fafd7d6fc1e0d 100644
--- a/modules/fdlibm/src/math_private.h
+++ b/modules/fdlibm/src/math_private.h
@@ -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;
/*

View File

@ -1,23 +0,0 @@
diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
index 0069865..e806fc8 100644
--- a/media/ffvpx/libavcodec/moz.build
+++ b/media/ffvpx/libavcodec/moz.build
@@ -108,10 +108,14 @@
'vp9prob.c',
'vp9recon.c'
]
- USE_LIBS += [
- 'dav1d',
- 'media_libdav1d_asm',
- ]
+ if CONFIG["MOZ_SYSTEM_AV1"]:
+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
+ else:
+ USE_LIBS += [
+ 'dav1d',
+ 'media_libdav1d_asm',
+ ]
if CONFIG['MOZ_WAYLAND']:
LOCAL_INCLUDES += ['/media/mozva']
SOURCES += [

View File

@ -1,13 +0,0 @@
diff -up firefox-100.0/widget/gtk/nsWindow.cpp.1196777 firefox-100.0/widget/gtk/nsWindow.cpp
--- firefox-100.0/widget/gtk/nsWindow.cpp.1196777 2022-05-02 11:29:06.763325015 +0200
+++ firefox-100.0/widget/gtk/nsWindow.cpp 2022-05-02 11:30:49.100717334 +0200
@@ -163,7 +163,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
- GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
+ GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
+ GDK_FOCUS_CHANGE_MASK;
/* utility functions */
static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,

View File

@ -1,69 +0,0 @@
--- a/memory/mozalloc/throw_gcc.h 2022-02-02 17:33:38 UTC
+++ b/memory/mozalloc/throw_gcc.h
@@ -74,50 +74,66 @@ __throw_bad_function_call(void) {
mozalloc_abort("fatal: STL threw bad_function_call");
}
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_logic_error(
const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_domain_error(
const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_invalid_argument(const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_length_error(
const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_out_of_range(
const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_runtime_error(
const char* msg) {
mozalloc_abort(msg);
}
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_range_error(
const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_overflow_error(const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
+#if !defined(_LIBCPP_VERSION)
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void
__throw_underflow_error(const char* msg) {
mozalloc_abort(msg);
}
+#endif // _LIBCPP_VERSION
MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_ios_failure(
const char* msg) {

View File

@ -1,49 +0,0 @@
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -2353,18 +2353,6 @@ with only_when(compile_environment & tar
)
set_config("MOZ_D3DCOMPILER_VISTA_DLL_PATH", d3d_compiler_dll.path)
-# Remoting protocol support
-# ==============================================================
-
-
-@depends(toolkit)
-def has_remote(toolkit):
- if toolkit in ("gtk", "windows", "cocoa"):
- return True
-
-
-set_config("MOZ_HAS_REMOTE", has_remote)
-set_define("MOZ_HAS_REMOTE", has_remote)
# RLBox Library Sandboxing wasm support
# ==============================================================
@@ -2900,6 +2888,26 @@ with only_when(toolkit_gtk):
set_config("MOZ_ENABLE_DBUS", True)
set_define("MOZ_ENABLE_DBUS", True)
+# Remoting protocol support
+# ==============================================================
+
+@depends(
+ toolkit,
+ depends("--enable-dbus", when=toolkit_gtk)(lambda x: x),
+ depends(wayland_headers, when=toolkit_gtk)(lambda x: x),
+ depends(x11_headers, when=toolkit_gtk)(lambda x: x),
+)
+def has_remote(toolkit, dbus, wayland, x11):
+ if toolkit in ("windows", "cocoa"):
+ return True
+ if toolkit == "gtk":
+ if not dbus and wayland and not x11:
+ return
+ return True
+
+
+set_config("MOZ_HAS_REMOTE", has_remote)
+set_define("MOZ_HAS_REMOTE", has_remote)
# Necko's wifi scanner
# ==============================================================

View File

@ -1,55 +0,0 @@
From 67157b1aa7da0a146b7d2d5abb9237eea1f434ec Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Fri, 23 Sep 2022 02:38:29 +0200
Subject: [PATCH] fix sqlite3 on ppc with clang
The __ppc__ macro is always defined on clang but not gcc, which
results in sqlite mistakenly thinking that ppc64le with clang
is big endian.
Also disable some inline assembly stuff on ppc that is never used
with gcc and probably was never tested with modern machines.
---
third_party/sqlite3/src/sqlite3.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c
index 4f3dc68..9017062 100644
--- a/third_party/sqlite3/src/sqlite3.c
+++ b/third_party/sqlite3/src/sqlite3.c
@@ -14317,9 +14317,9 @@ typedef INT16_TYPE LogEst;
# if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__)
# define SQLITE_BYTEORDER 1234
-# elif defined(sparc) || defined(__ppc__) || \
+# elif defined(sparc) || defined(__BIG_ENDIAN__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
# define SQLITE_BYTEORDER 4321
# else
@@ -20713,7 +20713,7 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt);
return val;
}
-#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__))
+#elif 0
__inline__ sqlite_uint64 sqlite3Hwtime(void){
unsigned long long retval;
@@ -196385,9 +196385,9 @@ struct RtreeMatchArg {
#if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
- defined(__arm__)
+ defined(__arm__) || defined(__LITTLE_ENDIAN__)
# define SQLITE_BYTEORDER 1234
-#elif defined(sparc) || defined(__ppc__)
+#elif defined(sparc) || defined(__BIG_ENDIAN__)
# define SQLITE_BYTEORDER 4321
#else
# define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */
--
2.37.3

View File

@ -1,82 +0,0 @@
diff -Naur a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
--- a/build/moz.configure/lto-pgo.configure 2023-08-01 09:34:24.624120874 +0300
+++ b/build/moz.configure/lto-pgo.configure 2023-08-01 09:42:14.109375611 +0300
@@ -91,9 +91,9 @@
def pgo_flags(compiler, profdata, target_is_windows, pgo_temporal):
if compiler.type == "gcc":
return namespace(
- gen_cflags=["-fprofile-generate"],
+ gen_cflags=["-fprofile-generate", "-DMOZ_PROFILE_INSTRUMENTATION"],
gen_ldflags=["-fprofile-generate"],
- use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
+ use_cflags=["-fprofile-use", "-fprofile-correction", "-Wno-coverage-mismatch"],
use_ldflags=["-fprofile-use"],
)
@@ -105,7 +105,7 @@
else:
gen_ldflags = ["-fprofile-generate"]
- gen_cflags = [prefix + "-fprofile-generate"]
+ gen_cflags = [prefix + "-fprofile-generate", "-DMOZ_PROFILE_INSTRUMENTATION"]
if target_is_windows:
# native llvm-profdata.exe on Windows can't read profile data
diff -Naur a/build/pgo/profileserver.py b/build/pgo/profileserver.py
--- a/build/pgo/profileserver.py 2023-08-01 09:34:24.630120978 +0300
+++ b/build/pgo/profileserver.py 2023-08-01 09:47:01.544871568 +0300
@@ -87,9 +87,22 @@
locations = ServerLocations()
locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
- old_profraw_files = glob.glob("*.profraw")
- for f in old_profraw_files:
- os.remove(f)
+ using_gcc = False
+ try:
+ if build.config_environment.substs.get('CC_TYPE') == 'gcc':
+ using_gcc = True
+ except BuildEnvironmentNotFoundException:
+ pass
+
+ if using_gcc:
+ for dirpath, _, filenames in os.walk('.'):
+ for f in filenames:
+ if f.endswith('.gcda'):
+ os.remove(os.path.join(dirpath, f))
+ else:
+ old_profraw_files = glob.glob('*.profraw')
+ for f in old_profraw_files:
+ os.remove(f)
with TemporaryDirectory() as profilePath:
# TODO: refactor this into mozprofile
@@ -213,6 +226,10 @@
print("Firefox exited successfully, but produced a crashreport")
sys.exit(1)
+ print('Copying profile data....')
+ os.system('pwd');
+ os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
+
llvm_profdata = env.get("LLVM_PROFDATA")
if llvm_profdata:
profraw_files = glob.glob("*.profraw")
diff -Naur a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp
--- a/toolkit/components/terminator/nsTerminator.cpp 2023-08-01 09:34:19.635034175 +0300
+++ b/toolkit/components/terminator/nsTerminator.cpp 2023-08-01 09:43:37.076062984 +0300
@@ -460,6 +460,13 @@
}
#endif
+ // Disable watchdog for PGO train builds - writting profile information at
+ // exit may take time and it is better to make build hang rather than
+ // silently produce poorly performing binary.
+#ifdef MOZ_PROFILE_INSTRUMENTATION
+ crashAfterMS = INT32_MAX;
+#endif
+
UniquePtr<Options> options(new Options());
// crashAfterTicks is guaranteed to be > 0 as
// crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS

View File

@ -1,30 +0,0 @@
diff -r 4cb22dd449d6 third_party/libwebrtc/moz.build
--- a/third_party/libwebrtc/moz.build Mon Aug 07 08:16:50 2023 +0000
+++ b/third_party/libwebrtc/moz.build Tue Aug 08 13:57:02 2023 -0700
@@ -603,16 +603,26 @@
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
"/third_party/libwebrtc/third_party/drm/drm_gn",
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
"/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
]
+if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
+
+ DIRS += [
+ "/third_party/libwebrtc/modules/portal/portal_gn",
+ "/third_party/libwebrtc/third_party/drm/drm_gn",
+ "/third_party/libwebrtc/third_party/gbm/gbm_gn",
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
+ "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+ ]
+
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
"/third_party/libwebrtc/common_audio/common_audio_neon_gn"
]
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":

View File

@ -1,16 +0,0 @@
diff -Naur a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
--- a/security/sandbox/linux/moz.build 2023-07-04 13:57:56.029462755 +0300
+++ b/security/sandbox/linux/moz.build 2023-07-04 14:05:08.607221195 +0300
@@ -114,9 +114,9 @@
# gcc lto likes to put the top level asm in syscall.cc in a different partition
# from the function using it which breaks the build. Work around that by
# forcing there to be only one partition.
-for f in CONFIG["OS_CXXFLAGS"]:
- if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
- LDFLAGS += ["--param lto-partitions=1"]
+if CONFIG['CC_TYPE'] != 'clang':
+ LDFLAGS += ['--param', 'lto-partitions=1']
+
DEFINES["NS_NO_XPCOM"] = True
DisableStlWrapping()

View File

@ -1,19 +0,0 @@
diff -up firefox-115.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi firefox-115.0/widget/gtk/GfxInfo.cpp
--- firefox-115.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi 2023-06-29 12:18:53.179833765 +0200
+++ firefox-115.0/widget/gtk/GfxInfo.cpp 2023-06-29 12:19:33.256212776 +0200
@@ -970,14 +970,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED,
V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_R600", "");
- // Disable on Release/late Beta on AMD
-#if !defined(EARLY_BETA_OR_EARLIER)
- APPEND_TO_DRIVER_BLOCKLIST(OperatingSystem::Linux, DeviceFamily::AtiAll,
- nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING,
- nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
- DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0),
- "FEATURE_HARDWARE_VIDEO_DECODING_DISABLE", "");
-#endif
////////////////////////////////////
// FEATURE_HW_DECODED_VIDEO_ZERO_COPY - ALLOWLIST
APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Linux, DeviceFamily::All,

View File

@ -1,76 +0,0 @@
--- firefox-111.0.1/build/moz.configure/rust.configure 2023-03-21 06:16:03.000000000 -0700
+++ firefox-111.0.1/build/moz.configure/rust.configure.new 2023-04-05 08:57:29.403219120 -0700
@@ -593,7 +593,7 @@
# ==============================================================
-option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
+option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
--- firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py 2023-03-21 06:16:09.000000000 -0700
+++ firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py.new 2023-04-05 08:57:31.270193468 -0700
@@ -191,6 +191,10 @@
to instantiate an option indirectly. Set this to a positive integer to
force the script to look into a deeper stack frame when inferring the
`category`.
+ - `comma_split` specifies whether the value string should be split on
+ commas. The default is True. Setting it False is necessary for things
+ like compiler flags which should be a single string that may contain
+ commas.
"""
__slots__ = (
@@ -205,6 +209,7 @@
"possible_origins",
"category",
"define_depth",
+ "comma_split",
)
def __init__(
@@ -218,6 +223,7 @@
category=None,
help=None,
define_depth=0,
+ comma_split=True,
):
if not name and not env:
raise InvalidOptionError(
@@ -335,9 +341,10 @@
self.choices = choices
self.help = help
self.category = category or _infer_option_category(define_depth)
+ self.comma_split = comma_split
@staticmethod
- def split_option(option):
+ def split_option(option, comma_split=True):
"""Split a flag or variable into a prefix, a name and values
Variables come in the form NAME=values (no prefix).
@@ -350,7 +357,13 @@
elements = option.split("=", 1)
name = elements[0]
- values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
+ if len(elements) == 2:
+ if comma_split:
+ values = tuple(elements[1].split(","))
+ else:
+ values = (elements[1],)
+ else:
+ values = ()
if name.startswith("--"):
name = name[2:]
if not name.islower():
@@ -426,7 +439,7 @@
% (option, origin, ", ".join(self.possible_origins))
)
- prefix, name, values = self.split_option(option)
+ prefix, name, values = self.split_option(option, self.comma_split)
option = self._join_option(prefix, name)
assert name in (self.name, self.env)

View File

@ -1,20 +0,0 @@
--- a/security/sandbox/linux/Sandbox.cpp 2023-07-10 20:29:48.000000000 +0100
+++ b/security/sandbox/linux/Sandbox.cpp 2023-07-15 09:13:43.561724668 +0100
@@ -18,6 +18,8 @@
#include <dirent.h>
#ifdef NIGHTLY_BUILD
# include "dlfcn.h"
+#else
+# include <dlfcn.h>
#endif
#include <errno.h>
#include <fcntl.h>
@@ -685,7 +687,7 @@
files->Add("/proc/stat", SandboxOpenedFile::Error{});
files->Add("/proc/net/unix", SandboxOpenedFile::Error{});
files->Add("/proc/self/maps", SandboxOpenedFile::Error{});
-
+ Unused << dlopen("libgcc_s.so.1", RTLD_GLOBAL|RTLD_LAZY);
// Finally, start the sandbox.
SetCurrentProcessSandbox(GetMediaSandboxPolicy(files));
}

View File

@ -1,63 +0,0 @@
diff --git a/third_party/rust/audio_thread_priority/src/rt_linux.rs b/third_party/rust/audio_thread_priority/src/rt_linux.rs
index e5c4f74..a542684 100644
--- a/third_party/rust/audio_thread_priority/src/rt_linux.rs
+++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs
@@ -112,7 +112,7 @@ fn rtkit_set_realtime(thread: u64, pid: u64, prio: u32) -> Result<(), Box<dyn Er
/// Returns the maximum priority, maximum real-time time slice, and the current real-time time
/// slice for this process.
-fn get_limits() -> Result<(i64, u64, libc::rlimit64), AudioThreadPriorityError> {
+fn get_limits() -> Result<(i64, u64, libc::rlimit), AudioThreadPriorityError> {
let c = Connection::get_private(BusType::System)?;
let p = Props::new(
@@ -122,7 +122,7 @@ fn get_limits() -> Result<(i64, u64, libc::rlimit64), AudioThreadPriorityError>
"org.freedesktop.RealtimeKit1",
DBUS_SOCKET_TIMEOUT,
);
- let mut current_limit = libc::rlimit64 {
+ let mut current_limit = libc::rlimit {
rlim_cur: 0,
rlim_max: 0,
};
@@ -141,9 +141,9 @@ fn get_limits() -> Result<(i64, u64, libc::rlimit64), AudioThreadPriorityError>
));
}
- if unsafe { libc::getrlimit64(libc::RLIMIT_RTTIME, &mut current_limit) } < 0 {
+ if unsafe { libc::getrlimit(libc::RLIMIT_RTTIME, &mut current_limit) } < 0 {
return Err(AudioThreadPriorityError::new_with_inner(
- "getrlimit64",
+ "getrlimit",
Box::new(OSError::last_os_error()),
));
}
@@ -154,13 +154,13 @@ fn get_limits() -> Result<(i64, u64, libc::rlimit64), AudioThreadPriorityError>
fn set_limits(request: u64, max: u64) -> Result<(), AudioThreadPriorityError> {
// Set a soft limit to the limit requested, to be able to handle going over the limit using
// SIGXCPU. Set the hard limit to the maxium slice to prevent getting SIGKILL.
- let new_limit = libc::rlimit64 {
+ let new_limit = libc::rlimit {
rlim_cur: request,
rlim_max: max,
};
- if unsafe { libc::setrlimit64(libc::RLIMIT_RTTIME, &new_limit) } < 0 {
+ if unsafe { libc::setrlimit(libc::RLIMIT_RTTIME, &new_limit) } < 0 {
return Err(AudioThreadPriorityError::new_with_inner(
- "setrlimit64",
+ "setrlimit",
Box::new(OSError::last_os_error()),
));
}
@@ -296,9 +296,9 @@ pub fn promote_thread_to_real_time_internal(
match r {
Ok(_) => Ok(handle),
Err(e) => {
- if unsafe { libc::setrlimit64(libc::RLIMIT_RTTIME, &limits) } < 0 {
+ if unsafe { libc::setrlimit(libc::RLIMIT_RTTIME, &limits) } < 0 {
return Err(AudioThreadPriorityError::new_with_inner(
- "setrlimit64",
+ "setrlimit",
Box::new(OSError::last_os_error()),
));
}

View File

@ -1,61 +0,0 @@
From: Sam James <sam@gentoo.org>
Subject: Allow RUST_TARGET override for detected Rust triplet (fixes musl build)
Respect RUST_TARGET from the environment to override Mozilla's
own triplet detection.
If the variable is unset, the old logic is used.
The issue is that Gentoo supports both, say:
- x86_64-unknown-linux-musl, and
- x86-64-gentoo-linux-musl
Our Rust is built to understand
-gentoo- as a vendor target, but
our Rust only actually includes
-unknown-.
Mozilla's configure sees -gentoo-
in CHOST and that Rust _understands_
-gentoo- and tries to use it, without
verifying that we actually have
-gentoo- installed as a Rust target.
This requires exporting RUST_TARGET
in the ebuild, possibly like:
````
inherit rust-toolchain
src_configure() {
[...]
export RUST_TARGET=$(rust_abi)
[...]
}
````
Inspired by Alpine's patch at
https://git.alpinelinux.org/aports/tree/community/firefox/fix-rust-target.patch?id=740922900cf8042be6751fcfcccdd3fc11bd77d3.
Bug: https://bugs.gentoo.org/748849
Bug: https://bugs.gentoo.org/779178
Bug: https://bugs.gentoo.org/836226
Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org>
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -275,6 +275,7 @@ def rust_supported_targets(rustc):
return data
+@imports('os')
def detect_rustc_target(
host_or_target, compiler_info, arm_target, rust_supported_targets
):
@@ -396,7 +397,7 @@ def detect_rustc_target(
return None
- rustc_target = find_candidate(candidates)
+ rustc_target = os.environ.get('RUST_TARGET', find_candidate(candidates))
if rustc_target is None:
die("Don't know how to translate {} for rustc".format(host_or_target.alias))

View File

@ -1,39 +0,0 @@
--- a/layout/style/ServoBindings.toml 2024-02-05 19:08:14.000000000 +0100
+++ b/layout/style/ServoBindings.toml 2024-03-22 05:05:13.000000000 +0100
@@ -365,6 +365,9 @@ opaque-types = [
"std::namespace::atomic___base", "std::atomic__My_base",
"std::atomic",
"std::atomic___base",
+ "std::tuple.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571
+ "std::.*::tuple.*",
+
# We want everything but FontVariation and Float to be opaque but we don't
# have negative regexes.
"mozilla::gfx::(.{0,4}|.{6,12}|.{14,}|([^F][^o][^n][^t][^V][^a][^r][^i][^a][^t][^i][^o][^n])|([^F][^l][^o][^a][^t]))",
@@ -390,8 +393,6 @@ opaque-types = [
# for clang.
"mozilla::SeenPtrs",
"mozilla::SupportsWeakPtr",
- "std::tuple",
- "std::tuple_.*", # Causes "Cannot find type _Pred in this scope" error on mac, like rust-skia#571
"SupportsWeakPtr",
"mozilla::detail::WeakReference",
"mozilla::WeakPtr",
--- a/build/moz.configure/toolchain.configure 2024-03-16 22:53:15.409390707 +0000
+++ b/build/moz.configure/toolchain.configure 2024-03-16 22:57:02.661805132 +0000
@@ -2157,10 +2157,10 @@
set_define("_LIBCPP_HIDE_FROM_ABI", libcxx_override_visibility.hide_from_abi)
-@depends(target, build_environment)
-def visibility_flags(target, env):
+@depends(target, build_environment, c_compiler)
+def visibility_flags(target, env, c_compiler):
if target.os != "WINNT":
- if target.kernel == "Darwin":
+ if target.kernel == "Darwin" or (c_compiler.type == "clang" and c_compiler.version >= "17.0.0"):
return ("-fvisibility=hidden", "-fvisibility-inlines-hidden")
return (
"-I%s/system_wrappers" % os.path.join(env.dist),

View File

@ -8,12 +8,12 @@
pkgbase=thunderbird
pkgname=(thunderbird)
pkgver=115.11.1
pkgver=128.2.1
pkgrel=1
pkgdesc='Standalone mail and news reader from mozilla.org'
url='https://www.thunderbird.net/'
arch=(x86_64 powerpc64le riscv64)
license=(MPL GPL LGPL)
license=('MPL-2.0' 'GPL-2.0-only' 'LGPL-2.1-only')
depends=(
glibc
gtk3 libgdk-3.so libgtk-3.so
@ -56,7 +56,7 @@ depends=(
)
makedepends=(
unzip zip diffutils python mesa libpulse libice libsm
rustup clang llvm cbindgen lld
rust clang llvm cbindgen lld
gawk perl findutils libotr wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi
)
makedepends_powerpc64le=(nodejs)
@ -64,81 +64,24 @@ makedepends_powerpc64=(nodejs)
makedepends_riscv64=(nodejs-lts-iron)
makedepends_x86_64=(nasm nodejs)
options=(!emptydirs !makeflags !lto)
source=(https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc}
source=(https://archive.mozilla.org/pub/thunderbird/releases/${pkgver}esr/source/thunderbird-${pkgver}esr.source.tar.xz{,.asc}
vendor-prefs.js
distribution.ini
mozconfig.cfg
metainfo.patch
org.mozilla.Thunderbird.desktop
0001-Don-t-use-build-id.patch
0002-Fortify-sources-properly.patch
0003-bmo-847568-Support-system-harfbuzz.patch
0004-bmo-847568-Support-system-graphite2.patch
0005-bmo-1559213-Support-system-av1.patch
0006-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
0007-musl-Fix-syscall-wrappers.patch
0008-musl-Only-use-system-heap-reporter-with-glibc.patch
0009-musl-Set-pthread-name-for-non-glibc-systems.patch
0010-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
0011-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
0012-Make-PGO-use-toolchain.patch
0013-build-Disable-Werror.patch
0014-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
0015-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
0016-bgo-816975-fix-build-on-x86.patch
0017-bmo-1559213-fix-system-av1-libs.patch
0018-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
0019-bmo-1754469-memory_mozalloc_throw.patch
0020-bgo-860033-firefox-wayland-no-dbus.patch
0021-qm-qm-fix-sqlite3-on-ppc-with-clang.patch
0022-fix-building-gcc-pgo-and-disable-watchdog-on-pgo-builds.patch
0023-bgo-908297-ppc64-webrtc.patch
0024-bmo-1516803-gcc-lto-sandbox.patch
0025-enable-vaapi-on-all-amd-cards.patch
0026-bgo-907963-rustflags-single-string.patch
0027-bgo-910309-dont-link-widevineplugin-to-libgcc_s.patch
0028-bmo-1853580-musl-non-lfs64-api-on-audio_thread_priority-crate.patch
0029-bmo-1862601-system-icu-74.patch
0030-bgo-748849-RUST_TARGET_override.patch
0031-bgo-928729-libcxx-18.patch)
sha256sums=('e0ceb1b9d3e19d5d1fd743eb9e473751bf0c671c00e234f95736f624309b26a5'
thunderbird-system-icu-74.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
https://github.com/user-attachments/files/16571198/esrpatches.zip
)
sha256sums=('81a404aa574b1cb9355bf8ac882ddfa7c2db646a3f8388f63dbec1506f68548a'
'SKIP'
'fa11b4736bbf53ec015f71cd42b1040b22d1a855c562b76927b3f0eccb925c85'
'4a3a61e119637000c563a194283ef741959756b75edf7be84e25b4253c4288c5'
'59cab9977c3effbba33129c014e87414ea939c02be859f1f0b9d79581c8935eb'
'3390d127e5dd70a0ff60895bcb044ec4521dd528cd9d6efc27c4ba58df9cca5c'
'cc7c3ed80b8ff04d1edf97ddd977aab59fc2354526eb3835b3a91df09fa40d90'
'0921ed9bb168484a4d85a7c6979cabf11184b64806ba6eaae4727798b57b337c'
'a8c2459f4e316954da4859254dadf6aecad3e3279f26a8d7af05e875ca04aca5'
'87da448b7fe5604a0f2a351f44dd6f324e95bc553f8e5534fa289965dda70e61'
'fd83c836cc52bce2e3962392b63ad3ee2c69173f50fde00543f982981de1ddc8'
'7c6db1dd501c99cd5d4ba59e66dd1f5d3065008b2c343e733201982de0a89ac6'
'8d34520b8a8a5c6b0633a59a72e076df9621cf6e93e5e70f036223fbbab4a254'
'4d9d7ac287b37c950c70640addace870ee9a0c16d8e30d54883ee545bf77527b'
'8b6c802f6f429b2385cba2c8b2a68ee0b40adeeaa4dbcc9cb535ab379494b150'
'a3472d0922a800b2c3043089f13cc8f2dd5f6448af3a1dcb23f385783c91c75f'
'dc373813110d7a1035e8615ce5598e119b74c8c6d5c27dae09a79727933f4672'
'd32b4cc299882a6ca86ef231b3dcb6d44f517070656daae2143915894915d3a4'
'7b45e98356e6afbb67e0ff005cedd5b2022093bf1716ef0936ab3f6615f787da'
'e773d271fd7c74a725fb2709d6e4132dcfcf4df5a90c8c27d89a0d58330f7968'
'18fc8bab428137702d6774a93d3cc8d8f6b8ea68e1d86b32591e2c242e80e767'
'40cd47e73ac3e87f0f072f164ccd81d857c0cdb57c60e2077233952219d9b6e8'
'1d4add2a4afff50e4067ef4c404f781513c1c388126754fba1bf0323b1e093b3'
'31ba77f95e5fe8414aeeef6858c8a774fc83f8cbbf032c0b82910de55f4304f4'
'b47ea62937d7f87485e0f372c0110785bbb6f4dbc79d3d139d54887cac0773e3'
'ba1013f0b5a76312802ac62cc5dbc35ecdcd3d4946df78c4b3fc144afc829023'
'efdf58e256b298bf8f0c0b7ead119830e99d1b2bf29ba1e43a9e0eeb8ac2e538'
'5f0ca8811b4f4967b311270ccf0f5e1aca5917bec37eb54f2b241d0da1641a30'
'dea0cee8a2670103e31c4ef9f09c7f7929148d641f72455d0787e33fde5b7d7d'
'ec615e2cf8d228ad3cd9ea879b2913b48a39e902d710e4d5a850e55bb060f91f'
'16a3dfe3c7cdddec4fb952e1bfc239ec3e63abd24791dcc44d78e1e4f1a7f54b'
'4b9d46a5234b1a85860bb25498e64b3835a87eb66310b1dba453cd3d5b19d9f1'
'0174ea3524914a5f4434a221861041b978686b622f2a297c3a354f925f44fdbd'
'1d802d862298c6c00a1bd8972de1ddf9f3f1e2bb7c9be354636ee70f076d7f39'
'e4021d909c815317814bd81609c2b2d82f0b16bbd3b38d492f097cd640445131'
'b07223e5928a5a0d4cb53e5c1a80cd93289f2f69a622c08e76d41a2434277ecc'
'14249e4ff055151e54692377f1f7fa5dc4c32571236c5bd092af1f1399e5df3a'
'912cbf446b40a675ad4a0ecee7fc8c256a1125ddcea614441d905c2828cc8cfb')
'9a4241af157512580d85e04cc5502248680a178c75038d70ff446055c59e80e6'
'2d7e423c9590b3196f1a0ee2fdff760ae13328a75ae39cfd895b3f53f60f93c5')
validpgpkeys=(
14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases <release@mozilla.com>
4360FE2109C49763186F8E21EBE41E90F6F12F6D # Mozilla Software Releases <release@mozilla.com>
@ -146,21 +89,15 @@ validpgpkeys=(
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: These are for Arch POWER use ONLY. For your own distribution, please
# get your own set of keys. Feel free to contact foutrelis@archlinux.org for
# more information.
# get your own set of keys.
_google_api_key=AIzaSyDgkw4O3LM0Jnr2N7Wq2NG7iUVzRU5sBaA
# Mozilla API keys (see https://location.services.mozilla.com/api)
# Note: These are for Arch POWER use ONLY. For your own distribution, please
# get your own set of keys. Feel free to contact heftig@archlinux.org for
# more information.
# get your own set of keys.
_mozilla_api_key=de0473f2-d53f-46da-956c-6aff61bda3ab
prepare() {
# packed_simd no longer builds with 1.78.0
rustup toolchain update --profile minimal 1.77.2
rustup default 1.77.2
cd $pkgname-$pkgver
echo "${noextract[@]}"
@ -170,15 +107,13 @@ prepare() {
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
msg2 "Applying patch $src..."
echo "Applying patch $src..."
patch -Np1 < "../$src"
done
sed -e 's/\("files":{\)[^}]*/\1/' \
-i third_party/rust/audio_thread_priority/.cargo-checksum.json
sed -e 's|73114a5c28472e77082ad259113ffafb418ed602c1741f26da3e10278b0bf93e|a88d6cc10ec1322b53a8f4c782b5133135ace0fdfcf03d1624b768788e17be0f|' \
-i third_party/rust/mp4parse/.cargo-checksum.json
sed -e 's|880c982df0843cbdff38b9f9c3829a2d863a224e4de2260c41c3ac69e9148ad4|239b3e4d20498f69ed5f94481ed932340bd58cb485b26c35b09517f249d20d11|' \
-i third_party/rust/bindgen/.cargo-checksum.json
# Make icon transparent
sed -i '/^<rect/d' comm/mail/branding/thunderbird/TB-symbolic.svg
@ -190,7 +125,26 @@ prepare() {
case "${CARCH}" in
powerpc64*)
# JIT enablement on powerpc64le provided for ESR by classilla
# https://github.com/chmeeedalf/gecko-dev/issues/5
patch -Np1 -i ${srcdir}/esrpatches/823087.diff
patch -Np1 -i ${srcdir}/esrpatches/823088.diff
patch -Np1 -i ${srcdir}/esrpatches/823089.diff
patch -Np1 -i ${srcdir}/esrpatches/823090.diff
patch -Np1 -i ${srcdir}/esrpatches/823091.diff
patch -Np1 -i ${srcdir}/esrpatches/823092.diff
patch -Np1 -i ${srcdir}/esrpatches/823093.diff
patch -Np1 -i ${srcdir}/esrpatches/823094.diff
echo "ac_add_options --disable-webrtc" >> .mozconfig
echo "export CC=${CHOST}-gcc" >> ../mozconfig
echo "export CXX=${CHOST}-g++" >> ../mozconfig
echo "ac_add_options --enable-optimize=\"${CXXFLAGS} -fpermissive -DXXH_NO_INLINE_HINTS=1\""
echo 'ac_add_options --enable-linker=bfd' >> ../mozconfig
echo 'ac_add_options --enable-lto=full' >> ../mozconfig
echo 'ac_add_options --without-wasm-sandboxed-libraries' >> ../mozconfig
echo 'ac_add_options --disable-sandbox' >> ../mozconfig
echo 'ac_add_options --enable-jit' >> ../mozconfig
;;
riscv64)
sed 's@.*enable-linker.*@@g' -i .mozconfig
@ -203,7 +157,6 @@ prepare() {
build() {
cd $pkgname-$pkgver
if [[ -n "${SOURCE_DATE_EPOCH}" ]]; then
export MOZ_BUILD_DATE=$(date --date "@${SOURCE_DATE_EPOCH}" "+%Y%m%d%H%M%S")
fi
@ -212,7 +165,9 @@ build() {
# malloc_usable_size is used in various parts of the codebase
CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
CFLAGS="${CFLAGS/-fexceptions/}"
CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
CXXFLAGS="${CXXFLAGS/-fexceptions/}"
./mach configure
./mach build
@ -257,4 +212,5 @@ END
ln -srf "$pkgdir/usr/bin/$pkgname" \
"$pkgdir/usr/lib/$pkgname/thunderbird-bin"
}
# vim:set sw=2 et:

View File

@ -12,52 +12,53 @@ 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
=/ReQ
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
GnlSHYmdIS4=
=Ylsd
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -12,52 +12,53 @@ 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
=/ReQ
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
GnlSHYmdIS4=
=Ylsd
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,6 +1,3 @@
https://bugs.gentoo.org/917599
https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
# HG changeset patch
# User André Bargull <andre.bargull@gmail.com>
@ -38,4 +35,3 @@ diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
// Overrides based on rules for the different line-break values given in