Merge branch 'master' of https://gitlab.com/librewolf-community/browser/linux into debian

3 files changed, 40 insertions, 16 deletions

diff --git a/flatpak/content/io.gitlab.LibreWolf.desktop b/flatpak/content/io.gitlab.LibreWolf.desktop
new file mode 100644
index 0000000..d55cf7d
--- /dev/null
+++ b/flatpak/content/io.gitlab.LibreWolf.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Name=LibreWolf
+Exec=librewolf %u
+Icon=io.gitlab.LibreWolf
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
+StartupWMClass=LibreWolf
+Categories=Network;WebBrowser;
+StartupNotify=true
+Terminal=false
+X-MultipleArgs=false
+Keywords=Internet;WWW;Browser;Web;Explorer;
+Actions=new-window;new-private-window;profilemanager;
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=librewolf %u
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Exec=librewolf --private-window %u
+
+[Desktop Action profilemanager]
+Name=Open the Profile Manager
+Exec=librewolf --ProfileManager %u
diff --git a/flatpak/content/io.gitlab.LibreWolf.json b/flatpak/content/io.gitlab.LibreWolf.json
index 4bd5bbd..2871030 100644
--- a/flatpak/content/io.gitlab.LibreWolf.json
+++ b/flatpak/content/io.gitlab.LibreWolf.json
@@ -1,9 +1,12 @@
 {
     "app-id": "io.gitlab.LibreWolf",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "3.36",
+    "runtime-version": "3.38",
     "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,24 @@
     ],
     "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",
+        "--env=MOZ_ENABLE_WAYLAND=1",
         "--share=network"
     ]
 }
diff --git a/flatpak/content/librewolf.desktop b/flatpak/content/librewolf.desktop
deleted file mode 100644
index c6d6de1..0000000
--- a/flatpak/content/librewolf.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=LibreWolf
-Exec=librewolf %u
-Icon=librewolf
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=LibreWolf
-Categories=Network;WebBrowser;
-StartupNotify=true
-Terminal=false
-X-MultipleArgs=false
-Keywords=Internet;WWW;Browser;Web;Explorer