From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09D3B158086 for ; Wed, 3 Nov 2021 17:05:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 457ABE091B; Wed, 3 Nov 2021 17:05:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A88B4E091C for ; Wed, 3 Nov 2021 17:05:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C83C342BE0 for ; Wed, 3 Nov 2021 17:05:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97C0C197 for ; Wed, 3 Nov 2021 17:05:49 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1635959145.fe6afd3fadd8c6064ff0397cc5e20653d3a8caa9.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-91.3.0.ebuild www-client/firefox/firefox-94.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: fe6afd3fadd8c6064ff0397cc5e20653d3a8caa9 X-VCS-Branch: master Date: Wed, 3 Nov 2021 17:05:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e507339-fbbf-4814-b11e-304affb652e6 X-Archives-Hash: b26f553022d36c8f1c278753501a94d6 commit: fe6afd3fadd8c6064ff0397cc5e20653d3a8caa9 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Nov 3 16:59:09 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Nov 3 17:05:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6afd3f www-client/firefox: sync with mail-client/thunderbird Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox/firefox-91.3.0.ebuild | 83 +++++++++++++++++++++++-------- www-client/firefox/firefox-94.0.ebuild | 84 ++++++++++++++++++++++++-------- 2 files changed, 129 insertions(+), 38 deletions(-) diff --git a/www-client/firefox/firefox-91.3.0.ebuild b/www-client/firefox/firefox-91.3.0.ebuild index 9b64305a6e4..6a93d263c45 100644 --- a/www-client/firefox/firefox-91.3.0.ebuild +++ b/www-client/firefox/firefox-91.3.0.ebuild @@ -48,7 +48,7 @@ if [[ ${PV} == *_rc* ]] ; then fi PATCH_URIS=( - https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} + https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} ) SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz @@ -61,15 +61,23 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" SLOT="0/esr$(ver_cut 1)" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate - hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux - +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent - +system-libvpx +system-webp wayland wifi" + +IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" +IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" +IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp" +IUSE+=" wayland wifi" + +# Firefox-only IUSE +IUSE+=" geckodriver" +IUSE+=" +gmp-autoupdate" +IUSE+=" screencast" REQUIRED_USE="debug? ( !system-av1 ) - screencast? ( wayland ) wifi? ( dbus )" +# Firefox-only REQUIRED_USE flags +REQUIRED_USE+=" screencast? ( wayland )" + BDEPEND="${PYTHON_DEPS} app-arch/unzip app-arch/zip @@ -227,15 +235,50 @@ llvm_check_deps() { } MOZ_LANGS=( - ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy - da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu - fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM - ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my - nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco - si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi - xh zh-CN zh-TW + af ar ast be bg br ca cak cs cy da de dsb + el en-CA en-GB en-US es-AR es-ES et eu + fi fr fy-NL ga-IE gd gl he hr hsb hu + id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO + pa-IN pl pt-BR pt-PT rm ro ru + sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW ) +# Firefox-only LANGS +MOZ_LANGS+=( ach ) +MOZ_LANGS+=( an ) +MOZ_LANGS+=( az ) +MOZ_LANGS+=( bn ) +MOZ_LANGS+=( bs ) +MOZ_LANGS+=( ca-valencia ) +MOZ_LANGS+=( eo ) +MOZ_LANGS+=( es-CL ) +MOZ_LANGS+=( es-MX ) +MOZ_LANGS+=( fa ) +MOZ_LANGS+=( ff ) +MOZ_LANGS+=( gn ) +MOZ_LANGS+=( gu-IN ) +MOZ_LANGS+=( hi-IN ) +MOZ_LANGS+=( hy-AM ) +MOZ_LANGS+=( ia ) +MOZ_LANGS+=( km ) +MOZ_LANGS+=( kn ) +MOZ_LANGS+=( lij ) +MOZ_LANGS+=( mk ) +MOZ_LANGS+=( mr ) +MOZ_LANGS+=( my ) +MOZ_LANGS+=( ne-NP ) +MOZ_LANGS+=( oc ) +MOZ_LANGS+=( sco ) +MOZ_LANGS+=( si ) +MOZ_LANGS+=( son ) +MOZ_LANGS+=( szl ) +MOZ_LANGS+=( ta ) +MOZ_LANGS+=( te ) +MOZ_LANGS+=( tl ) +MOZ_LANGS+=( trs ) +MOZ_LANGS+=( ur ) +MOZ_LANGS+=( xh ) + mozilla_set_globals() { # https://bugs.gentoo.org/587334 local MOZ_TOO_REGIONALIZED_FOR_L10N=( @@ -961,9 +1004,9 @@ src_install() { # Install system-wide preferences local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences" insinto "${PREFS_DIR}" - newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js + newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js - local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js" + local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js" # Set dictionary path to use system hunspell cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref" @@ -1108,7 +1151,9 @@ pkg_postinst() { elog fi - local show_doh_information show_normandy_information show_shortcut_information + local show_doh_information + local show_normandy_information + local show_shortcut_information if [[ -z "${REPLACING_VERSIONS}" ]] ; then # New install; Tell user that DoH is disabled by default @@ -1155,10 +1200,10 @@ pkg_postinst() { if [[ -n "${show_shortcut_information}" ]] ; then elog - elog "Since firefox-91.0 we no longer install multiple shortcuts for" + elog "Since ${PN}-91.0 we no longer install multiple shortcuts for" elog "each supported display protocol. Instead we will only install" - elog "one generic Mozilla Firefox shortcut." - elog "If you still want to be able to select between running Mozilla Firefox" + elog "one generic Mozilla ${PN^} shortcut." + elog "If you still want to be able to select between running Mozilla ${PN^}" elog "on X11 or Wayland, you have to re-create these shortcuts on your own." fi } diff --git a/www-client/firefox/firefox-94.0.ebuild b/www-client/firefox/firefox-94.0.ebuild index 5c7cbe52269..adbc1566ba3 100644 --- a/www-client/firefox/firefox-94.0.ebuild +++ b/www-client/firefox/firefox-94.0.ebuild @@ -48,7 +48,7 @@ if [[ ${PV} == *_rc* ]] ; then fi PATCH_URIS=( - https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} + https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} ) SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz @@ -61,13 +61,22 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" SLOT="0/$(ver_cut 1)" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate - hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux - +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent - +system-libvpx +system-webp wayland wifi" + +IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" +IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" +IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp" +IUSE+=" wayland wifi" + +# Firefox-only IUSE +IUSE+=" geckodriver" +IUSE+=" +gmp-autoupdate" +IUSE+=" screencast" REQUIRED_USE="debug? ( !system-av1 ) - screencast? ( wayland )" + wifi? ( dbus )" + +# Firefox-only REQUIRED_USE flags +REQUIRED_USE+=" screencast? ( wayland )" BDEPEND="${PYTHON_DEPS} app-arch/unzip @@ -226,15 +235,50 @@ llvm_check_deps() { } MOZ_LANGS=( - ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy - da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu - fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM - ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my - nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco - si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi - xh zh-CN zh-TW + af ar ast be bg br ca cak cs cy da de dsb + el en-CA en-GB en-US es-AR es-ES et eu + fi fr fy-NL ga-IE gd gl he hr hsb hu + id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO + pa-IN pl pt-BR pt-PT rm ro ru + sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW ) +# Firefox-only LANGS +MOZ_LANGS+=( ach ) +MOZ_LANGS+=( an ) +MOZ_LANGS+=( az ) +MOZ_LANGS+=( bn ) +MOZ_LANGS+=( bs ) +MOZ_LANGS+=( ca-valencia ) +MOZ_LANGS+=( eo ) +MOZ_LANGS+=( es-CL ) +MOZ_LANGS+=( es-MX ) +MOZ_LANGS+=( fa ) +MOZ_LANGS+=( ff ) +MOZ_LANGS+=( gn ) +MOZ_LANGS+=( gu-IN ) +MOZ_LANGS+=( hi-IN ) +MOZ_LANGS+=( hy-AM ) +MOZ_LANGS+=( ia ) +MOZ_LANGS+=( km ) +MOZ_LANGS+=( kn ) +MOZ_LANGS+=( lij ) +MOZ_LANGS+=( mk ) +MOZ_LANGS+=( mr ) +MOZ_LANGS+=( my ) +MOZ_LANGS+=( ne-NP ) +MOZ_LANGS+=( oc ) +MOZ_LANGS+=( sco ) +MOZ_LANGS+=( si ) +MOZ_LANGS+=( son ) +MOZ_LANGS+=( szl ) +MOZ_LANGS+=( ta ) +MOZ_LANGS+=( te ) +MOZ_LANGS+=( tl ) +MOZ_LANGS+=( trs ) +MOZ_LANGS+=( ur ) +MOZ_LANGS+=( xh ) + mozilla_set_globals() { # https://bugs.gentoo.org/587334 local MOZ_TOO_REGIONALIZED_FOR_L10N=( @@ -960,9 +1004,9 @@ src_install() { # Install system-wide preferences local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences" insinto "${PREFS_DIR}" - newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js + newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js - local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js" + local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js" # Set dictionary path to use system hunspell cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref" @@ -1107,7 +1151,9 @@ pkg_postinst() { elog fi - local show_doh_information show_normandy_information show_shortcut_information + local show_doh_information + local show_normandy_information + local show_shortcut_information if [[ -z "${REPLACING_VERSIONS}" ]] ; then # New install; Tell user that DoH is disabled by default @@ -1154,10 +1200,10 @@ pkg_postinst() { if [[ -n "${show_shortcut_information}" ]] ; then elog - elog "Since firefox-91.0 we no longer install multiple shortcuts for" + elog "Since ${PN}-91.0 we no longer install multiple shortcuts for" elog "each supported display protocol. Instead we will only install" - elog "one generic Mozilla Firefox shortcut." - elog "If you still want to be able to select between running Mozilla Firefox" + elog "one generic Mozilla ${PN^} shortcut." + elog "If you still want to be able to select between running Mozilla ${PN^}" elog "on X11 or Wayland, you have to re-create these shortcuts on your own." fi }