From cb6d3d5e91cdd74fc293dd0e11f10307f6b5e27f Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 3 May 2024 22:16:48 +0200 Subject: [PATCH] Fix flatpak --- com.quexten.Goldwarden.yml | 8 ++++++++ gui/src/gui/template_loader.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/com.quexten.Goldwarden.yml b/com.quexten.Goldwarden.yml index ac801f1..b177f29 100644 --- a/com.quexten.Goldwarden.yml +++ b/com.quexten.Goldwarden.yml @@ -25,6 +25,13 @@ finish-args: # biometric / user password auth - --system-talk-name=org.freedesktop.PolicyKit1 modules: + - name: "blueprint-compiler" + buildsystem: meson + cleanup: ['*'] + sources: + - type: git + url: https://gitlab.gnome.org/jwestman/blueprint-compiler + tag: v0.12.0 - ./gui/python3-requirements.json - name: goldwarden-python-ui buildsystem: simple @@ -35,6 +42,7 @@ modules: - install -D ./gui/com.quexten.Goldwarden.desktop /app/share/applications/com.quexten.Goldwarden.desktop - install -D ./gui/goldwarden.svg /app/share/icons/hicolor/scalable/apps/com.quexten.Goldwarden.svg - install -Dm644 ./gui/com.quexten.Goldwarden.metainfo.xml -t /app/share/metainfo/ + - blueprint-compiler batch-compile /app/bin/src/gui/.templates/ /app/bin/src/gui/ /app/bin/src/gui/*.blp sources: - type: dir path: ./ diff --git a/gui/src/gui/template_loader.py b/gui/src/gui/template_loader.py index 675beb0..65c0a8c 100644 --- a/gui/src/gui/template_loader.py +++ b/gui/src/gui/template_loader.py @@ -2,7 +2,7 @@ import os from gi.repository import Gtk isflatpak = os.path.exists("/.flatpak-info") -pathprefix = "/app/bin/" if isflatpak else "./src/gui/" +pathprefix = "/app/bin/src/gui/" if isflatpak else "./src/gui/" def load_template(path): builder = Gtk.Builder()