Merge branch 'main' of https://github.com/Stremio/stremio-linux-shell into feat/tray-icon

Author: tymmesyde

.github/workflows/release.yml

@@ -37,8 +37,8 @@ jobs:
           python3 -m pip install toml aiohttp
 
       - name: Build flatpak package
-        run: ./build-aux/flatpak/build.sh
+        run: ./flatpak/build.sh
       - name: Upload flatpak package to release
         uses: softprops/action-gh-release@v2
         with:
-          files: ./build-aux/flatpak/*.flatpak
+          files: ./flatpak/*.flatpak

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "build-aux/flatpak/flatpak-builder-tools"]
-	path = build-aux/flatpak/flatpak-builder-tools
+[submodule "flatpak/flatpak-builder-tools"]
+	path = flatpak/flatpak-builder-tools
 	url = https://github.com/flatpak/flatpak-builder-tools
-[submodule "build-aux/flatpak/shared-modules"]
-	path = build-aux/flatpak/shared-modules
+[submodule "flatpak/shared-modules"]
+	path = flatpak/shared-modules
 	url = https://github.com/flathub/shared-modules

README.md

@@ -40,7 +40,7 @@ python3 -m pip install toml aiohttp
 ```
 
 ```bash
-./build-aux/flatpak/build.sh
+./flatpak/build.sh
 ```
 
 ### How it works

com.stremio.App.Devel.json

@@ -26,6 +26,7 @@
         "--share=ipc",
         "--share=network",
         "--device=dri",
+        "--filesystem=home/.stremio-server:create",
         "--filesystem=xdg-data/stremio:create",
         "--filesystem=xdg-run/stremio:create",
         "--env=LD_LIBRARY_PATH=/app/lib/:/app/lib64/:/app/share/stremio",
@@ -70,7 +71,7 @@
                     "type": "dir",
                     "path": "."
                 },
-                "build-aux/flatpak/cargo-sources.json"
+                "flatpak/cargo-sources.json"
             ],
             "modules": [
                 {
@@ -167,6 +168,6 @@
                 }
             ]
         },
-        "build-aux/flatpak/shared-modules/libappindicator/libappindicator-gtk3-12.10.json"
+        "flatpak/shared-modules/libappindicator/libappindicator-gtk3-12.10.json"
     ]
 }

build-aux/flatpak/.gitignore flatpak/.gitignorebuild-aux/flatpak/.gitignore renamed to flatpak/.gitignore

@@ -1,10 +1,9 @@
 #!/bin/sh
 
 package_id="com.stremio.App.Devel"
-cwd="build-aux/flatpak"
+cwd="flatpak"
 
 python3 $cwd/flatpak-builder-tools/cargo/flatpak-cargo-generator.py Cargo.lock -o $cwd/cargo-sources.json
 
-flatpak-builder --force-clean $cwd/build $package_id.json
-flatpak build-export $cwd/repo $cwd/build
+flatpak-builder --repo=$cwd/repo --force-clean $cwd/build $package_id.json
 flatpak build-bundle $cwd/repo $cwd/$package_id.flatpak $package_id