From b2155006e853b953d6f8b27b1036bc8766454e16 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:17:31 -0800
Subject: [PATCH 01/13] workflows: add e2e flatpak test

---
 .github/workflows/e2e.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c9d66e7d3..635dea810 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
       - name: Install dependencies
         run: |
-          sudo apt-get install meson scdoc python3-hatchling python3-build python3-installer python3-filelock shellcheck bubblewrap cargo
+          sudo apt-get install meson scdoc python3-hatchling python3-build python3-installer python3-filelock shellcheck bubblewrap cargo flatpak-builder
           python3 -m pip install --upgrade pip
           pip install uv
       - name: Initialize submodules
@@ -35,6 +35,14 @@ jobs:
       - name: Setup venv
         run: |
           uv venv --python 3.10
+      - name: Test Flatpak
+        run: |
+          source .venv/bin/activate
+          cd packaging/flatpak
+          flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
+          flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher
+          GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" ""
+          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
       - name: Test steamrt install
         run: |
           source .venv/bin/activate

From a7c22e1a4779f3f32067a04a0e44a90c5dcc9ff7 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:21:42 -0800
Subject: [PATCH 02/13] workflows: fix flathub ref

---
 .github/workflows/e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 635dea810..1c74a53c4 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,6 +39,7 @@ jobs:
         run: |
           source .venv/bin/activate
           cd packaging/flatpak
+          flatpak remote-add --user --if-not-exists flathub
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
           flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher
           GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" ""

From 15de04be7e441295e6bcf472b305addf8684c12d Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:23:16 -0800
Subject: [PATCH 03/13] workflows: fix flathub ref

---
 .github/workflows/e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1c74a53c4..e52cbae8e 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           source .venv/bin/activate
           cd packaging/flatpak
-          flatpak remote-add --user --if-not-exists flathub
+          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
           flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher
           GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" ""

From 91abe57dc3499b7d29915eed5e7d549c4fcf01bb Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:28:49 -0800
Subject: [PATCH 04/13] fix: add missing subproject for flatpak

---
 .gitmodules             | 3 +++
 subprojects/python-xlib | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 subprojects/python-xlib

diff --git a/.gitmodules b/.gitmodules
index e69de29bb..3f8f2ebd7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/python-xlib"]
+	path = subprojects/python-xlib
+	url = git@github.com:python-xlib/python-xlib.git
diff --git a/subprojects/python-xlib b/subprojects/python-xlib
new file mode 160000
index 000000000..4e8bbf8fc
--- /dev/null
+++ b/subprojects/python-xlib
@@ -0,0 +1 @@
+Subproject commit 4e8bbf8fc4941e5da301a8b3db8d27e98de68666

From 55b180eca74d10cc4b39bb5e9df60995d4f142cf Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:33:13 -0800
Subject: [PATCH 05/13] Revert "fix: add missing subproject for flatpak"

This reverts commit 91abe57dc3499b7d29915eed5e7d549c4fcf01bb.
---
 .gitmodules             | 3 ---
 subprojects/python-xlib | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 subprojects/python-xlib

diff --git a/.gitmodules b/.gitmodules
index 3f8f2ebd7..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "subprojects/python-xlib"]
-	path = subprojects/python-xlib
-	url = git@github.com:python-xlib/python-xlib.git
diff --git a/subprojects/python-xlib b/subprojects/python-xlib
deleted file mode 160000
index 4e8bbf8fc..000000000
--- a/subprojects/python-xlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4e8bbf8fc4941e5da301a8b3db8d27e98de68666

From 765aa251ddc299b689f6355ab74157fa4fee7998 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:33:41 -0800
Subject: [PATCH 06/13] fix: add missing subproject for flatpak

---
 .gitmodules             | 3 +++
 subprojects/python-xlib | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 subprojects/python-xlib

diff --git a/.gitmodules b/.gitmodules
index e69de29bb..a6452efb7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/python-xlib"]
+	path = subprojects/python-xlib
+	url = https://github.com/python-xlib/python-xlib.git
diff --git a/subprojects/python-xlib b/subprojects/python-xlib
new file mode 160000
index 000000000..4e8bbf8fc
--- /dev/null
+++ b/subprojects/python-xlib
@@ -0,0 +1 @@
+Subproject commit 4e8bbf8fc4941e5da301a8b3db8d27e98de68666

From 7eb46d6bce7db1da8b41b8587bc49d6b5e5174ff Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:50:12 -0800
Subject: [PATCH 07/13] workflows: fix git error

- Works around the fatal error from git's clone operation.
---
 .github/workflows/e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e52cbae8e..cdc192518 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,6 +39,7 @@ jobs:
         run: |
           source .venv/bin/activate
           cd packaging/flatpak
+          git config --global protocol.file.allow always
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
           flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher

From 027c1cb38eea4e9f5ccdab8a1b6c5f2cf372bf8d Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:57:02 -0800
Subject: [PATCH 08/13] workflows: add flatpak workflow

---
 .github/workflows/e2e.yml     | 10 --------
 .github/workflows/flatpak.yml | 46 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/flatpak.yml

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index cdc192518..41bc26aac 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -35,16 +35,6 @@ jobs:
       - name: Setup venv
         run: |
           uv venv --python 3.10
-      - name: Test Flatpak
-        run: |
-          source .venv/bin/activate
-          cd packaging/flatpak
-          git config --global protocol.file.allow always
-          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
-          flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher
-          GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" ""
-          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
       - name: Test steamrt install
         run: |
           source .venv/bin/activate
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
new file mode 100644
index 000000000..ffe81b86f
--- /dev/null
+++ b/.github/workflows/flatpak.yml
@@ -0,0 +1,46 @@
+name: flatpak
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: |
+          sudo apt-get install meson scdoc python3-hatchling python3-build python3-installer python3-filelock shellcheck bubblewrap cargo flatpak-builder
+          python3 -m pip install --upgrade pip
+          pip install uv
+      - name: Initialize submodules
+        run: |
+          git submodule update --init --recursive
+      - name: Make user install
+        run: |
+          ./configure.sh --user-install
+          make install
+      - name: Run shellcheck
+        run: |
+          shellcheck tests/*.sh
+      - name: Setup venv
+        run: |
+          uv venv --python 3.10
+      - name: Test Flatpak
+        run: |
+          source .venv/bin/activate
+          cd packaging/flatpak
+          git config --global protocol.file.allow always
+          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
+          flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher
+          GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u

From 305106eadcdb92edbd782c784a53e37f6d50ca94 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 21:07:11 -0800
Subject: [PATCH 09/13] workflows: execute umu-run inside container

---
 .github/workflows/flatpak.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index ffe81b86f..3c8721944 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -42,5 +42,4 @@ jobs:
           git config --global protocol.file.allow always
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
-          flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher
-          GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u
+          flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher && GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u

From 36ad8d5dea73eb9487d08554bc8cc3a2a5ebdf21 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Mon, 13 Jan 2025 21:41:50 -0800
Subject: [PATCH 10/13] workflows: update flatpak command

---
 .github/workflows/flatpak.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 3c8721944..b224489ea 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -42,4 +42,4 @@ jobs:
           git config --global protocol.file.allow always
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
-          flatpak run --command=sh --devel org.openwinecomponents.umu.umu-launcher && GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u
+          flatpak run --command=sh --devel --filesystem=$(pwd) org.openwinecomponents.umu.umu-launcher && GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u

From 8fe61d8104635a3e361618996b69f985547da98a Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:29:39 -0800
Subject: [PATCH 11/13] workflows: remove venv setup

---
 .github/workflows/flatpak.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index b224489ea..5fb03e30b 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -32,12 +32,8 @@ jobs:
       - name: Run shellcheck
         run: |
           shellcheck tests/*.sh
-      - name: Setup venv
-        run: |
-          uv venv --python 3.10
       - name: Test Flatpak
         run: |
-          source .venv/bin/activate
           cd packaging/flatpak
           git config --global protocol.file.allow always
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo

From e88ce0123825517007dd23cb621f1c5facc0d16d Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:29:57 -0800
Subject: [PATCH 12/13] workflows: enable verbose mode

---
 .github/workflows/flatpak.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 5fb03e30b..bc307b8f6 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -38,4 +38,4 @@ jobs:
           git config --global protocol.file.allow always
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
-          flatpak run --command=sh --devel --filesystem=$(pwd) org.openwinecomponents.umu.umu-launcher && GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u
+          flatpak -v run --command=sh --devel --filesystem=$(pwd) org.openwinecomponents.umu.umu-launcher && GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u

From b4b07af4c70b1acf026fc55072b1ec424e511878 Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Tue, 14 Jan 2025 12:48:35 -0800
Subject: [PATCH 13/13] workflows: fix flatpak command

---
 .github/workflows/flatpak.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index bc307b8f6..e93c4e37c 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -38,4 +38,6 @@ jobs:
           git config --global protocol.file.allow always
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak-builder --force-clean --user --install-deps-from=flathub --repo=umu-repo --install umu-launcher org.openwinecomponents.umu.umu-launcher.yml
-          flatpak -v run --command=sh --devel --filesystem=$(pwd) org.openwinecomponents.umu.umu-launcher && GAMEID=umu-0 UMU_LOG=1 "$HOME/.local/bin/umu-run" wineboot -u
+          mkdir -p "$HOME"/.var/app/org.openwinecomponents.umu.umu-launcher
+          cp -a "$HOME"/.local/bin/umu-run "$HOME"/.var/app/org.openwinecomponents.umu.umu-launcher
+          GAMEID=umu-0 UMU_LOG=1 flatpak -v run --command='umu-run wineboot -u' --devel --filesystem=$(pwd) org.openwinecomponents.umu.umu-launcher