Testing fixes for flatpak generation & lib64

KaruroChori · Dec 17, 2024 · 5cddea2 · 5cddea2
1 parent be85ade
commit 5cddea2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/flatpak/com.karurochari.vs.yml b/flatpak/com.karurochari.vs.yml
@@ -14,7 +14,9 @@ modules:
   - name: vs-fltk
     buildsystem: meson
     config-opts:
-      #- --prefix=/usr
+      # https://github.com/flatpak/freedesktop-sdk-base/commit/6adb6f49e52575956cf6aa0bbd3a1d8054735a43
+      # should have solved the issue of lib64... but somehow it is not applied?
+      - --libdir=lib
       - --native-file=/run/build/vs-fltk/toolchains/flatpak.ini
       - --buildtype=release
       - -Dtests=false

diff --git a/flatpak/make.sh b/flatpak/make.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 flatpak-builder --force-clean --user --install-deps-from=flathub --repo=repo dist com.karurochari.vs.yml 
+cp -R ./dist/files/lib64/* ./dist/files/lib
 flatpak build-bundle repo vs.flatpak com.karurochari.vs
diff --git a/metadata/meson.build b/metadata/meson.build
@@ -18,7 +18,7 @@ if ascli_exe.found()
 
   install_data(
     sources: ['vs.light.svg'],
-    rename: ['vs.svg'],
+    rename: ['com.karurochari.vs.svg'],
     install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'),
   )
 

diff --git a/metadata/metainfo.xml b/metadata/metainfo.xml
@@ -16,7 +16,7 @@
 
     <launchable type="desktop-id">com.karurochari.vs.desktop</launchable>
 
-    <icon type="stock">vs</icon>
+    <icon type="stock">com.karurochari.vs</icon>
 
     <categories>
         <category>Network</category>