From: Ahmad Fatoum <ahmad@a3f.at> To: barebox@lists.infradead.org Subject: [PATCH master] logo: Makefile: fix inkscape Wayland GUI opening on LOGO.S Date: Sun, 11 Oct 2020 10:06:25 +0200 [thread overview] Message-ID: <20201011080625.470522-1-ahmad@a3f.at> (raw) DISPLAY="" only affects x11 clients. Building sandbox_defconfig under Wayland will still result in annoying inkscape windows being opened. Drop DISPLAY = "" in favor of --shell, which should never display a GUI. --shell has been part of inkscape since 2009 and so should be generally available. There is also --without-gui, but that is now deprecated and without effect. --shell tested working on Inkscape 1.0.1 with both GDK_BACKEND=wayland and GDK_BACKEND=x11. Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> --- Cc: Antony Pavlov <antonynpavlov@gmail.com> Hello Sascha, can this be applied to master? --- lib/logo/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/logo/Makefile b/lib/logo/Makefile index bf700da89b03..f0fe2c85477b 100644 --- a/lib/logo/Makefile +++ b/lib/logo/Makefile @@ -39,16 +39,16 @@ cmd_logo_S = \ $(call if_changed,logo_S) # Inkscape 0.92.4 supports -z but Inkscape 1.0 doesn't -INKSCAPEOPTS += $(call try-run, inkscape -z,-z,) +INKSCAPEOPTS += $(call try-run, inkscape --shell -z,-z,) # Inkscape 0.92.4 uses -e but Inkscape 1.0 uses --export-type=png -INKSCAPEOPTS += $(call try-run, inkscape -e -,-e -,--export-type=png) +INKSCAPEOPTS += $(call try-run, inkscape --shell -e -,-e -,--export-type=png) # Inkscape 1.0 supports -o - -INKSCAPEOPTS += $(call try-run, inkscape -o -,-o -,) +INKSCAPEOPTS += $(call try-run, inkscape --shell -o -,-o -,) quiet_cmd_logo = LOGO.S $@ cmd_logo = \ ( \ - DISPLAY="" inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \ + inkscape --shell $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \ ) %.bblogo: $(srctree)/Documentation/barebox.svg FORCE -- 2.28.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-10-11 8:06 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-11 8:06 Ahmad Fatoum [this message] 2020-10-12 12:07 ` Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201011080625.470522-1-ahmad@a3f.at \ --to=ahmad@a3f.at \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH master] logo: Makefile: fix inkscape Wayland GUI opening on LOGO.S' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox