FreeTubeApp / FreeTube

An Open Source YouTube app for privacy
https://freetubeapp.io/
GNU Affero General Public License v3.0
13.63k stars 861 forks source link

Fix wayland app icon for flatpak. #6134

Closed mariakeating closed 1 day ago

mariakeating commented 1 week ago

Fix wayland app icon for flatpak.

Pull Request Type

Description

Currently, the app icon (i.e. titlebar icon in KDE) is incorrect as the app_id is set to FreeTube instead of matching the desktop file with io.freetubeapp.FreeTube.

Screenshots

Screenshot_20241111_001919

Testing

Testing done on an arch linux install. Untested for distribution packages nor windows and macos builds.

Desktop

absidue commented 1 week ago

Dismissing my review because it's probably worth checking that this doesn't break the deb builds, which afaik use the .desktop file that electron-builder auto-generates instead of the static one in the flatpak repo.

mariakeating commented 1 week ago

I don't understand how an extra package.json field would change anything about the flatpak.

It's not changing the flatpak, it's changing the value of the app_id set for the xdg_toplevel to match the .desktop file the flatpak provides. If flatpak didn't require such a naming convention, I would have made a PR on the flatpak's repo to rename the file.

Dismissing my review because it's probably worth checking that this doesn't break the deb builds, which afaik use the .desktop file that electron-builder auto-generates instead of the static one in the flatpak repo.

Definitely worth checking. My understanding from the docs is that this also changes the name of the generated .desktop file but I'm not familiar with this tooling.

mariakeating commented 1 week ago

Unfortunately, with this change, the file generated for .deb files is still named freetube.desktop instead of matching the desktopName key, resulting in wayland icons broken outside of flatpak.

Seems like electron builder makes this very frustrating. https://github.com/electron-userland/electron-builder/issues/4071

Unless anybody knows how to work around this, I will close and instead make a PR for the flatpak's repo as there is another option that would achieve this (2nd paragraph). https://docs.flatpak.org/en/latest/electron.html#using-correct-desktop-file-name

absidue commented 1 day ago

As you've opened an pull request on the flatpak repo, I'll close this one. As flathub does a release every time a pull request is merged, we'll merge your pull requests next time we do a FreeTube release, just so you don't think we've forgotten or ignoring it :).