commit: 6df3faf82239bb42832e1057188b5204be986415 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 14:10:31 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Apr 23 14:20:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df3faf8
www-client/firefox: bug fixes for 112.0.1 - add error-state returning to virtwl(), - allow disabling telemetry via an USE flag, - include an upstream patch to fix weird bitmap font behaviour (upstream bug #1827950). Bug: https://bugs.gentoo.org/904354 Closes: https://bugs.gentoo.org/904756 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-112.0.1.ebuild | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 14523ba76438..5516f4b93524 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -98,7 +98,7 @@ DIST firefox-102.10.0esr-zh-TW.xpi 614579 BLAKE2B f43efdbc63293629474fb02f5cae5c DIST firefox-102.10.0esr.source.tar.xz 479026088 BLAKE2B b4d8eaa6d72b009d12b435781c360f043bca7554d8b069b8d858399ece03f20703d7e36427a3f92d0b801a94b1c3f132904f21e51ba4118116bbfa4e5668d651 SHA512 f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b DIST firefox-102esr-patches-10j.tar.xz 21744 BLAKE2B 326f206dfcd5b6ea2f06f5f537505e23d358f6d7930f7e72fd8e54af88d97172170999c246af888278143810df42be9414541e47feb48b60732565a4ee38579e SHA512 5efa50b221abedbb84c1b3d19d8ac089ac5752448e8c90c6aed9f43bf3eee876b7e7050a1678bca65f6b23734c4945b016bf059a3921ad7290b0150538111bbd DIST firefox-112-patches-02j.tar.xz 17296 BLAKE2B c47545a6eeec32c9a15aa0a5f9f4535e186a2b8e7c140b10f9e8665b90f9d1c74673dbbcd3e0e6e3a2232fe060f340884dbb431d755bf21537923efb4bb430e1 SHA512 d90c8cc81f5c885bce35d6872162eaefa529a37db905424eba2e223f3f02a22ecf63b503550df77d7e73b539573f2169b2f6c99e7a46623be1492467ee19782d -DIST firefox-112-patches-04j.tar.xz 19448 BLAKE2B f93760e9c314f839d7db982b2b904cfe92de3bdd8006ba6fd783909c5fef2a7722fc60b22bdde0a9d833a956a7143b01663054d1c2a59b8c6a2151f9111c9f28 SHA512 30b27c0b1a66eb785654c624fc33ea148b587ba567b26dcb089603444b22b714052bf387c8c4e9288cc610456405b42b0c7e126bfaf37533bfbebad5f4349f28 +DIST firefox-112-patches-05j.tar.xz 20408 BLAKE2B 6ce921497a6d51d66d9f819a10c823a32090f81a77d5a7ec1c7f5f04c3dcd998c1999dcfbf512f2c028f99e49b41e44ba82dec0ea86d635f7e76904f460482b3 SHA512 56db4a7458bcbb000260ceef1dcabb9df9037dd6988cd710dcc98d63f9030baea411ce3f23eeede48dc87f0cc90689c26add328049d18f7061c5facf71b4e031 DIST firefox-112.0-ach.xpi 459577 BLAKE2B 3adb567d9b02f04e869236b7863d2f7425fe721f0c26bafd21aef30b0a761fc7dc0aedc7abf99429d6da19c6c33d4a7669edb1531526822e20d54d802f2bd92f SHA512 e3a0487ca57ba731bfbacf7628f497b623a68324d9464a73d18e36d3331dde434d05b73abe3d8864ce684d4bddd4d20b73ee53c397dfa9f665360dd612c7fc63 DIST firefox-112.0-af.xpi 423010 BLAKE2B 6f87c4cc3eab518c111793860845c34b3131d50500211b0e5b813b376c8a13d5aee071a40e9172e2482994234d4d5764e14a24bb68a9ae8b4b86e8bcb6f0b97a SHA512 000fd456377692eca76efde709d8526c599a38fb9839018cee726ca6359d3356f42f8620b892a9082cd8dcbad5c6be1346c7ef9bfed0b97910f7a343dc0e2cac DIST firefox-112.0-an.xpi 503915 BLAKE2B 2e7e5fa8a7ade25e28edf32402a3132333019938d315483bacd3156c7c1cdeebae037d144f67a04d3dc16004012d0d855b5091249f83ebb55c84b680c903cce7 SHA512 45915bb76a712cfd437526f59bb56ce7b493bdc636f783cea1f7e4809d178189ac4622b733465147c82fece78cb49a5f81bb3ef91ee5c6f4ef55415bba55b672 diff --git a/www-client/firefox/firefox-112.0.1.ebuild b/www-client/firefox/firefox-112.0.1.ebuild index 5e54183d96e8..ca950d5be751 100644 --- a/www-client/firefox/firefox-112.0.1.ebuild +++ b/www-client/firefox/firefox-112.0.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -FIREFOX_PATCHSET="firefox-112-patches-04j.tar.xz" +FIREFOX_PATCHSET="firefox-112-patches-05j.tar.xz" LLVM_MAX_SLOT=15 @@ -65,7 +65,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux" IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp" -IUSE+=" wayland wifi +X" +IUSE+=" telemetry wayland wifi +X" # Firefox-only IUSE IUSE+=" geckodriver +gmp-autoupdate screencast" @@ -460,9 +460,11 @@ virtwl() { debug-print "${FUNCNAME}: $@" "$@" + local r=$? [[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly" exec {VIRTWL[0]}<&- {VIRTWL[1]}>&- + return $r } pkg_pretend() { @@ -742,7 +744,9 @@ src_configure() { mozconfig_add_options_ac '' --enable-project=browser # Set Gentoo defaults - export MOZILLA_OFFICIAL=1 + if use telemetry; then + export MOZILLA_OFFICIAL=1 + fi mozconfig_add_options_ac 'Gentoo default' \ --allow-addon-sideload \ @@ -1051,6 +1055,13 @@ src_configure() { export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none" fi + if ! use telemetry; then + mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0" + mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0" + mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0" + mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0" + fi + # Disable notification when build system has finished export MOZ_NOSPAM=1
