From 7e22c6bc14b611368c5fcd98ab5edd4ea3261e1a Mon Sep 17 00:00:00 2001
From: karurochari <nope>
Date: Sat, 7 Dec 2024 06:04:25 +0000
Subject: [PATCH] Temporary fix for #3, but an upstream fix would be better.

---
 com.karurochari.vs.yml       | 11 ++++++-----
 docs/developers/releasing.md |  2 +-
 meson.build                  |  3 +--
 package.json                 |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/com.karurochari.vs.yml b/com.karurochari.vs.yml
index 9438c54..537f011 100644
--- a/com.karurochari.vs.yml
+++ b/com.karurochari.vs.yml
@@ -1,10 +1,10 @@
 id: com.karurochari.vs
 runtime: org.freedesktop.Platform
-runtime-version: '24.08'
+runtime-version: "24.08"
 sdk: org.freedesktop.Sdk
-sdk-extensions :
- - "org.freedesktop.Sdk.Extension.llvm19"
- - "org.freedesktop.Sdk.Extension.swift6" 
+sdk-extensions:
+  - "org.freedesktop.Sdk.Extension.llvm19"
+  - "org.freedesktop.Sdk.Extension.swift6"
 build-options:
   append-path: "/usr/lib/sdk/llvm19/bin:/usr/lib/sdk/swift6/bin"
   prepend-ld-library-path: "/usr/lib/sdk/llvm19/lib:/usr/lib/sdk/swift6/lib"
@@ -14,6 +14,7 @@ modules:
   - name: vs-fltk
     buildsystem: meson
     config-opts:
+      - --prefix=/usr
       - --native-file=/run/build/vs-fltk/toolchains/flatpak.ini
       - --buildtype=release
       - -Dtests=false
@@ -37,4 +38,4 @@ finish-args:
   # Home folder
   - --filesystem=home/.vs-fltk
 #cleanup:
-#  - '*'
\ No newline at end of file
+#  - '*'
diff --git a/docs/developers/releasing.md b/docs/developers/releasing.md
index 9cda476..61e086e 100644
--- a/docs/developers/releasing.md
+++ b/docs/developers/releasing.md
@@ -1,4 +1,4 @@
-## Todo list for release
+## Todo list for releases
 
 Ideally all these steps should be made automatic when a release request is triggered.  
 But for now they are not, so use this as a checklist for reference:
diff --git a/meson.build b/meson.build
index dc6b9ab..9ef0168 100644
--- a/meson.build
+++ b/meson.build
@@ -175,7 +175,6 @@ vs_fltk = shared_library(
 
         './src/loader.cpp',
 
-
         src_components,
         autogen_components,
 
@@ -300,4 +299,4 @@ pconf.generate(
     vs_fltk,
     description: 'VS fltk library (C interface only)',
     url: 'https://github.com/KaruroChori/vs-fltk/',
-)
+)
\ No newline at end of file
diff --git a/package.json b/package.json
index bc7dfeb..72d5da7 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,10 @@
     "codegen": "bun ./scripts/codegen/index.ts",
     "codegen.quick": "bun ./scripts/codegen/index.ts quick",
     "meson-devenv": "meson devenv -C build",
-    "meson-setup.release": "meson setup --reconfigure build/ --buildtype=release",
-    "meson-setup.clang-release": "meson setup --reconfigure build/ --buildtype=release --native-file toolchains/clang.ini",
-    "meson-setup.clang-debug": "meson setup --reconfigure build/ --buildtype=debug --native-file toolchains/clang.ini",
-    "meson-setup.zig-release": "meson setup --reconfigure build/ --buildtype=release --native-file toolchains/zig.ini",
+    "meson-setup.release": "meson setup --prefix=/usr --reconfigure build/ --buildtype=release",
+    "meson-setup.clang-release": "meson setup --prefix=/usr --reconfigure build/ --buildtype=release --native-file toolchains/clang.ini",
+    "meson-setup.clang-debug": "meson setup --prefix=/usr --reconfigure build/ --buildtype=debug --native-file toolchains/clang.ini",
+    "meson-setup.zig-release": "meson setup --prefix=/usr --reconfigure build/ --buildtype=release --native-file toolchains/zig.ini",
     "vs.example": "meson compile -C build/ vs:executable &&  VS_COMMONS_DIR=$(pwd)/build/commons/ ./build/vs run vs://examples/example-0.xml",
     "test": "meson test -C build/ --suite=vs-fltk",
     "benchmark": "meson test --benchmark -C build/ --suite=vs-fltk",