Merge pull request #31 from Stremio/refactor/gtk4

GTK 4

Author: tymmesyde

.cargo/config.toml

@@ -1,2 +1,3 @@
 [env]
-CEF_PATH = "vendor/cef"
+CEF_PATH = "vendor/cef"
+SERVER_PATH = "data/server.js"

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,27 @@
+name: Bug report
+description: Report a bug
+body:
+  - type: dropdown
+    id: install
+    attributes:
+      label: "Installation type"
+      options:
+        - Flatpak (.flatpak)
+        - Source
+    validations:
+      required: true
+
+  - type: input
+    id: platform
+    attributes:
+      label: "Platform"
+      placeholder: Fedora 42
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: "Describe the bug"
+    validations:
+      required: true

.github/workflows/build.yml

@@ -10,20 +10,28 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:resolute
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Rust setup
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions/checkout@v6
 
       - name: Install dependencies
         run: |
-          sudo apt-get -y update
-          sudo apt-get -y install build-essential libssl-dev libnss3 libmpv-dev libgtk-3-dev libappindicator3-dev
+          apt-get -y update
+          apt-get -y install build-essential curl libssl-dev \
+            libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev libmpv-dev gettext nodejs
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with: 
+          components: rustfmt, clippy
 
       - name: Lint fmt
         run: cargo fmt --all -- --check
+
       - name: Lint clippy
         run: cargo clippy --all --no-deps -- -D warnings
+
       - name: Build
         run: cargo build

.github/workflows/release.yml

@@ -10,32 +10,39 @@ permissions:
 jobs:
   release:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:resolute
+      options: --privileged
     steps:
+      - name: Install requirements
+        run: |
+          apt-get -y update
+          apt-get -y install build-essential curl libssl-dev git \
+            libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev libmpv-dev gettext nodejs flatpak-builder
+
       - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Update git submodules
-        run: git submodule update --init --recursive
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
 
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-  
-      - name: Setup Python
+      - name: Python setup
         uses: actions/setup-python@v5
         with:
           python-version: '3.13'
 
-      - name: Install requirements
+      - name: Setup Flatpak
         run: |
-          sudo apt-get -y update
-          sudo apt-get -y install build-essential libssl-dev libnss3 libmpv-dev flatpak-builder libgtk-3-dev libappindicator3-dev
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y \
-            org.freedesktop.Sdk//24.08 \
-            org.freedesktop.Platform//24.08 \
-            org.freedesktop.Sdk.Extension.rust-stable//24.08 \
-            org.freedesktop.Platform.ffmpeg-full//24.08
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y org.gnome.Sdk//50
+          flatpak install -y org.gnome.Platform//50
+          flatpak install -y org.freedesktop.Sdk.Extension.rust-stable//25.08
+          flatpak install -y org.freedesktop.Platform.ffmpeg-full//24.08
+          flatpak install -y org.freedesktop.Platform.VAAPI.Intel//25.08
           python3 -m pip install toml aiohttp
 
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+  
       - name: Build flatpak package
         run: ./flatpak/build.sh
       - name: Upload flatpak package to release

.gitignore

@@ -1,3 +1,3 @@
-/.flatpak-builder
 /target
-/vendor
+/vendor
+.flatpak-builder

.gitmodules

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