diff options
author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2021-01-01 01:38:44 +0100 |
---|---|---|
committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2021-01-01 01:48:34 +0100 |
commit | 9c0fcc0de564f832b8a630666094a80a2e43de07 (patch) | |
tree | 2b43f83054d35afdad00abfdc9566c66f09aedcd /flatpak/content/io.gitlab.LibreWolf.json | |
parent | Set default XDG_DATA_DIRS in AppRun if unset (diff) | |
download | librewolf-linux-9c0fcc0de564f832b8a630666094a80a2e43de07.tar.gz librewolf-linux-9c0fcc0de564f832b8a630666094a80a2e43de07.tar.bz2 librewolf-linux-9c0fcc0de564f832b8a630666094a80a2e43de07.zip |
Improve the Flatpak build process
.desktop file, icon and appdata are now properly exported by flatpak.
"Wayland first" flatpak, falling back to X11 if not on Wayland.
Note: this is currently potentially broken on many systems (ie. font
rendering is broken).
See https://github.com/flatpak/flatpak/issues/2861.
Might work when using Wayland + Gnome, does not seem to work on Arch +
Sway (couldn't get it working with any workaround for now).
Several smaller issues addressed.
A few untested issues might remain (Screensharing, WebRTC/Camera access)
Addresses (at least partially): #128, #132, #131, #118
Diffstat (limited to 'flatpak/content/io.gitlab.LibreWolf.json')
-rw-r--r-- | flatpak/content/io.gitlab.LibreWolf.json | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/flatpak/content/io.gitlab.LibreWolf.json b/flatpak/content/io.gitlab.LibreWolf.json index 4bd5bbd..2392b32 100644 --- a/flatpak/content/io.gitlab.LibreWolf.json +++ b/flatpak/content/io.gitlab.LibreWolf.json @@ -4,6 +4,9 @@ "runtime-version": "3.36", "sdk": "org.gnome.Sdk", "command": "librewolf", + "rename-desktop-file": "LibreWolf.desktop", + "rename-appdata-file": "LibreWolf.appdata.xml", + "rename-icon": "io.gitlab.LibreWolf", "modules": [ "flatpak/content/shared-modules/dbus-glib/dbus-glib-0.110.json", { @@ -11,6 +14,10 @@ "buildsystem": "simple", "build-commands": [ "mkdir -p /app/share && mv librewolf -t /app/share", + "mv share/appdata /app/share", + "mv share/applications /app/share", + "mv share/icons /app/share", + "mv share/metainfo /app/share", "mkdir -p /app/bin && ln -s /app/share/librewolf/librewolf /app/bin/" ], "sources": [ @@ -23,20 +30,23 @@ ], "finish-args": [ "--share=ipc", - "--socket=x11", + "--socket=wayland", + "--socket=fallback-x11", "--socket=pcsc", "--socket=pulseaudio", "--persist=.librewolf", "--persist=.mozilla", "--filesystem=xdg-download:rw", - "--device=all", + "--device=dri", + "--filesystem=~/.config/dconf:ro", + "--env=DCONF_USER_CONFIG_DIR=.config/dconf", "--talk-name=org.freedesktop.FileManager1", "--system-talk-name=org.freedesktop.NetworkManager", "--talk-name=org.a11y.Bus", "--talk-name=org.gnome.SessionManager", "--talk-name=org.freedesktop.ScreenSaver", "--talk-name=org.gtk.vfs.*", - "--socket=wayland", + "--socket=session-bus", "--share=network" ] } |