From e1ba7bf1d50b90420ce139a5ae859c922270cb49 Mon Sep 17 00:00:00 2001
From: Elias Projahn <elias@johrpan.de>
Date: Mon, 27 May 2024 12:30:02 +0200
Subject: [PATCH] flatpak: Refresh manifest based on gtk-rust-template

---
 de.johrpan.musicus.json | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/de.johrpan.musicus.json b/de.johrpan.musicus.json
index 96de668..9c243b8 100644
--- a/de.johrpan.musicus.json
+++ b/de.johrpan.musicus.json
@@ -4,41 +4,35 @@
     "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
-        "org.freedesktop.Sdk.Extension.rust-stable"
+        "org.freedesktop.Sdk.Extension.rust-stable",
+        "org.freedesktop.Sdk.Extension.llvm16"
     ],
     "command": "musicus",
     "finish-args": [
         "--share=network",
         "--share=ipc",
         "--socket=fallback-x11",
-        "--device=dri",
         "--socket=wayland",
         "--socket=pulseaudio",
+        "--device=dri",
+        "--filesystem=host",
         "--talk-name=org.mpris.MediaPlayer2.Player",
         "--own-name=org.mpris.MediaPlayer2.de.johrpan.musicus",
-        "--filesystem=host"
+        "--env=RUST_LOG=musicus=debug",
+        "--env=G_MESSAGES_DEBUG=none",
+        "--env=RUST_BACKTRACE=1"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
         "build-args": [
             "--share=network"
         ],
         "env": {
-            "RUST_BACKTRACE": "1",
-            "RUST_LOG": "musicus=debug"
+            "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
+            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
+            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
         }
     },
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig",
-        "/man",
-        "/share/doc",
-        "/share/gtk-doc",
-        "/share/man",
-        "/share/pkgconfig",
-        "*.la",
-        "*.a"
-    ],
     "modules": [
         {
             "name": "blueprint-compiler",
@@ -53,7 +47,6 @@
         },
         {
             "name": "musicus",
-            "builddir": true,
             "buildsystem": "meson",
             "sources": [
                 {