From 35a9f39f917927cb006f505fab7ec0d9187f1763 Mon Sep 17 00:00:00 2001
From: Jakob Meier <comcloudway@ccw.icu>
Date: Wed, 17 Jul 2024 09:34:52 +0200
Subject: [PATCH] Fix flatpak and update the flatpak guide to list missing
 steps

---
 flatpak/README.md         | 13 ++++++++++---
 flatpak/icu.ccw.Melon.yml |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/flatpak/README.md b/flatpak/README.md
index 0d90fb4..080df75 100644
--- a/flatpak/README.md
+++ b/flatpak/README.md
@@ -8,7 +8,7 @@ you can use the following steps to build the flatpak yourself.
 This guide is mostly taken from the [Build your first Flatpak Guide](https://docs.flatpak.org/en/latest/first-build.html).
 
 First of all, 
-make sure you have `flatpak-builder` installed.
+make sure you have `flatpak-builder` and `appstream-compose` installed.
 You can probably get this from your system repository.
 
 Additionally, 
@@ -25,9 +25,16 @@ navigate into the `flatpak` directory of the `melon` source
 cd flatpak
 ```
 
-build the project using:
+
+If you have never used flatpak before, 
+or haven't added the flathub repo, you have to add it before building the manifest
+``` sh
+flatpak remote-add --user --if-not-exists flathub "https://flathub.org/repo/flathub.flatpakrepo"
+```
+
+To build the melon flatpak from the manifest, simply run the following command:
 ```sh
-flatpak-builder build icu.ccw.Melon.yml --force-clean
+flatpak-builder build --install-deps-from=flathub --force-clean icu.ccw.Melon.yml
 ```
 
 If you want to build a different version than you local version,
diff --git a/flatpak/icu.ccw.Melon.yml b/flatpak/icu.ccw.Melon.yml
index d9a16bb..c102e4c 100644
--- a/flatpak/icu.ccw.Melon.yml
+++ b/flatpak/icu.ccw.Melon.yml
@@ -1,7 +1,7 @@
 ---
 app-id: icu.ccw.Melon
 runtime: org.gnome.Platform
-runtime-version: '45'
+runtime-version: '46'
 sdk: org.gnome.Sdk
 command: melon
 # from https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/blob/eb494599378cbb6d133b11748527402f59a97982/video/gtk4/README.md
@@ -9,6 +9,8 @@ build-options:
   env:
     CARGO_HOME: "/run/build/cargo-c/cargo"
   append-path: "/usr/lib/sdk/rust-stable/bin"
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.rust-stable
 finish-args:
   - "--share=network"
   - "--share=ipc"
-- 
2.38.5