From 4a2d9ae96960037583d22c129da82cb15127bcf4 Mon Sep 17 00:00:00 2001 From: Octavian Alexandru Butiu Date: Wed, 19 Mar 2025 22:14:24 +0200 Subject: [PATCH 1/3] port: Fix build error when building in a flatpak If you create a project with gnome builder and port it blueprint and try to build it in flatpak you will get a compiler error that /org/gnome/Example/window.ui. Setting the source_dir variable in meson fixes this. --- blueprintcompiler/interactive_port.py | 1 + 1 file changed, 1 insertion(+) diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py index 0c37885..26d8e2a 100644 --- a/blueprintcompiler/interactive_port.py +++ b/blueprintcompiler/interactive_port.py @@ -266,6 +266,7 @@ blueprints = custom_target('blueprints', arguments in {Colors.UNDERLINE}{meson_file}{Colors.NO_UNDERLINE}:{Colors.CLEAR} dependencies: blueprints, +source_dir: meson.current_build_dir(), """ ) enter() From 394014429e819347d107eb5fa9fd2871bdb3d0ac Mon Sep 17 00:00:00 2001 From: Sertonix Date: Thu, 20 Mar 2025 10:52:57 +0000 Subject: [PATCH 2/3] Sort keys in collect-sections.py This makes sure that the reference_docs.json file is build reproducible. Ref https://reproducible-builds.org/ --- docs/collect-sections.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/collect-sections.py b/docs/collect-sections.py index e6227e7..07bc5f6 100755 --- a/docs/collect-sections.py +++ b/docs/collect-sections.py @@ -132,5 +132,8 @@ if __name__ == "__main__": # print the sections to a json file with open(outfile, "w") as f: json.dump( - {name: section.to_json() for name, section in sections.items()}, f, indent=2 + {name: section.to_json() for name, section in sections.items()}, + f, + indent=2, + sort_keys=True, ) From fa3b84d61261867b40c3a9094b5ad51439be1746 Mon Sep 17 00:00:00 2001 From: Octavian Alexandru Butiu Date: Wed, 19 Mar 2025 22:14:24 +0200 Subject: [PATCH 3/3] port: Fix build error when building in a flatpak If you create a project with gnome builder and port it blueprint and try to build it in flatpak you will get a compiler error that /org/gnome/Example/window.ui. Setting the source_dir variable in meson fixes this. --- blueprintcompiler/interactive_port.py | 1 + 1 file changed, 1 insertion(+) diff --git a/blueprintcompiler/interactive_port.py b/blueprintcompiler/interactive_port.py index 0c37885..26d8e2a 100644 --- a/blueprintcompiler/interactive_port.py +++ b/blueprintcompiler/interactive_port.py @@ -266,6 +266,7 @@ blueprints = custom_target('blueprints', arguments in {Colors.UNDERLINE}{meson_file}{Colors.NO_UNDERLINE}:{Colors.CLEAR} dependencies: blueprints, +source_dir: meson.current_build_dir(), """ ) enter()