commit: 2a79f0ac9ea6ec38a76e45a1c6ddbbfbf09b598f Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Fri May 23 14:27:06 2025 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri May 23 14:27:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a79f0ac
mail-client/thunderbird-bin: fix .desktop file's startupwmclass - toggle correctly between esr/stable. Closes: https://bugs.gentoo.org/956422 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...thunderbird-bin-r2.desktop => thunderbird-bin-r3.desktop} | 2 +- ...in-128.10.2.ebuild => thunderbird-bin-128.10.2-r1.ebuild} | 12 +++++++++--- ...-bin-138.0.2.ebuild => thunderbird-bin-138.0.2-r1.ebuild} | 12 +++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/mail-client/thunderbird-bin/files/icon/thunderbird-bin-r2.desktop b/mail-client/thunderbird-bin/files/icon/thunderbird-bin-r3.desktop similarity index 96% rename from mail-client/thunderbird-bin/files/icon/thunderbird-bin-r2.desktop rename to mail-client/thunderbird-bin/files/icon/thunderbird-bin-r3.desktop index 20073ac30b93..a40818800238 100644 --- a/mail-client/thunderbird-bin/files/icon/thunderbird-bin-r2.desktop +++ b/mail-client/thunderbird-bin/files/icon/thunderbird-bin-r3.desktop @@ -22,7 +22,7 @@ StartupNotify=true Categories=Network;Email;Calendar; Keywords=email;messages;calendar Actions=profile-manager-window; -StartupWMClass=thunderbird-esr +StartupWMClass=@CLASS@ [Desktop Action profile-manager-window] Name=Open the Profile Manager diff --git a/mail-client/thunderbird-bin/thunderbird-bin-128.10.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-128.10.2-r1.ebuild similarity index 96% rename from mail-client/thunderbird-bin/thunderbird-bin-128.10.2.ebuild rename to mail-client/thunderbird-bin/thunderbird-bin-128.10.2-r1.ebuild index 7c94a3e4dc0b..f3d531bf14de 100644 --- a/mail-client/thunderbird-bin/thunderbird-bin-128.10.2.ebuild +++ b/mail-client/thunderbird-bin/thunderbird-bin-128.10.2-r1.ebuild @@ -219,7 +219,7 @@ src_install() { # Install menu local app_name="Mozilla ${MOZ_PN^} (bin)" - local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop" + local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop" local desktop_filename="${PN}.desktop" local exec_command="${PN}" local icon="${PN}" @@ -229,6 +229,12 @@ src_install() { use_wayland="true" fi + if [[ -n ${MOZ_ESR} ]] ; then + local wmclass="thunderbird-esr" + else + local wmclass="thunderbird" + fi + cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die # Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0. @@ -247,8 +253,8 @@ src_install() { -e "s:@NAME@:${app_name}:" \ -e "s:@EXEC@:${exec_command}:" \ -e "s:@ICON@:${icon}:" \ - "${WORKDIR}/${PN}.desktop-template" \ - || die + -e "s:@CLASS@:${wmclass}:" \ + "${WORKDIR}/${PN}.desktop-template" || die newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}" diff --git a/mail-client/thunderbird-bin/thunderbird-bin-138.0.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-138.0.2-r1.ebuild similarity index 96% rename from mail-client/thunderbird-bin/thunderbird-bin-138.0.2.ebuild rename to mail-client/thunderbird-bin/thunderbird-bin-138.0.2-r1.ebuild index e1662fec991b..7615977e3505 100644 --- a/mail-client/thunderbird-bin/thunderbird-bin-138.0.2.ebuild +++ b/mail-client/thunderbird-bin/thunderbird-bin-138.0.2-r1.ebuild @@ -219,7 +219,7 @@ src_install() { # Install menu local app_name="Mozilla ${MOZ_PN^} (bin)" - local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop" + local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop" local desktop_filename="${PN}.desktop" local exec_command="${PN}" local icon="${PN}" @@ -229,6 +229,12 @@ src_install() { use_wayland="true" fi + if [[ -n ${MOZ_ESR} ]] ; then + local wmclass="thunderbird-esr" + else + local wmclass="thunderbird" + fi + cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die # Add apulse support through our wrapper shell launcher, patchelf-method broken since 119.0. @@ -247,8 +253,8 @@ src_install() { -e "s:@NAME@:${app_name}:" \ -e "s:@EXEC@:${exec_command}:" \ -e "s:@ICON@:${icon}:" \ - "${WORKDIR}/${PN}.desktop-template" \ - || die + -e "s:@CLASS@:${wmclass}:" \ + "${WORKDIR}/${PN}.desktop-template" || die newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
