From 03fd2c9b7ef7bf721b0ae3a348750940c4a6848e Mon Sep 17 00:00:00 2001 From: nullishamy Date: Mon, 27 May 2024 15:09:02 +0100 Subject: [PATCH] fix: xfwm4 assets (#240) --- build.py | 8 ++++---- patches/xfwm4/generate_assets.py | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index 6d937982..5a9cbd58 100755 --- a/build.py +++ b/build.py @@ -371,15 +371,15 @@ def make_assets(ctx: BuildContext): f"{output_dir}/metacity-1/thumbnail.png", ) - xfwm4_assets = f"{THIS_DIR}/patches/xfwm4/generated/assets-catppuccin-{ctx.flavor.identifier}" - for file in glob.glob(xfwm4_assets + '/*'): + xfwm4_assets_root = f"{THIS_DIR}/patches/xfwm4/generated/assets-catppuccin-{ctx.flavor.identifier}" + for file in glob.glob(xfwm4_assets_root + '/*'): shutil.copy(file, f"{output_dir}/xfwm4") - xfwm4_assets = xfwm4_assets + "-hdpi/*" + xfwm4_assets = xfwm4_assets_root + "-hdpi/*" for file in glob.glob(xfwm4_assets): shutil.copy(file, f"{output_dir}-hdpi/xfwm4") - xfwm4_assets = xfwm4_assets + "-xhdpi/*" + xfwm4_assets = xfwm4_assets_root + "-xhdpi/*" for file in glob.glob(xfwm4_assets): shutil.copy(file, f"{output_dir}-xhdpi/xfwm4") diff --git a/patches/xfwm4/generate_assets.py b/patches/xfwm4/generate_assets.py index 88ae9c29..82cc89a5 100644 --- a/patches/xfwm4/generate_assets.py +++ b/patches/xfwm4/generate_assets.py @@ -151,6 +151,9 @@ def call_subprocesses(inp: WorkerInput): return [ subprocess.Popen( [ + # FIXME: https://gitlab.com/inkscape/inkscape/-/issues/4716#note_1882967469Z + "unshare", + "--user", inkscape, "--export-id", inp.ident,