From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <ahmad@a3f.at>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH master v2] logo: Makefile: fix Inkscape >= v1.0 Wayland GUI opening on LOGO.S
Date: Mon, 12 Oct 2020 14:13:11 +0200 [thread overview]
Message-ID: <20201012121311.GC11648@pengutronix.de> (raw)
In-Reply-To: <20201011094402.551050-1-ahmad@a3f.at>
On Sun, Oct 11, 2020 at 11:44:03AM +0200, Ahmad Fatoum wrote:
> DISPLAY="" only affects X11 windows. Building sandbox_defconfig under
> Wayland will still result in annoying Inkscape windows being opened.
>
> This happens due to $(call try-run, inkscape -z,-z). Inkscape v1.0
> deprecates -z and it's without an effect, so Inkscape will try
> to create a window, which failed under x11, but succeeded under Wayland.
>
> Fix this by always testing -z and -e together. We don't need one or
> the other anyway, because Inkscape v1.0, which supports neither,
> already uses no GUI for --export-type=png.
>
> This makes DISPLAY="" unnecessary. So just drop it.
>
> Tested working on Inkscape 1.0.1 and 0.92.4.
>
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
> Cc: Antony Pavlov <antonynpavlov@gmail.com>
>
> v1 -> v2:
> - --shell behavior differs between v0.* and v1.* and it resulted in
> broken images on v1.*
> ---
> lib/logo/Makefile | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
And replaced with v2.
Sascha
>
> diff --git a/lib/logo/Makefile b/lib/logo/Makefile
> index bf700da89b03..3d0f1c24c640 100644
> --- a/lib/logo/Makefile
> +++ b/lib/logo/Makefile
> @@ -38,17 +38,15 @@ cmd_logo_S = \
> %.bblogo.S: %.bblogo FORCE
> $(call if_changed,logo_S)
>
> -# Inkscape 0.92.4 supports -z but Inkscape 1.0 doesn't
> -INKSCAPEOPTS += $(call try-run, inkscape -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)
> +# Inkscape 0.92.4 supports -z -e but Inkscape 1.0 uses --export-type=png
> +INKSCAPEOPTS += $(call try-run, inkscape -z -e -,-z -e -,--export-type=png)
> # Inkscape 1.0 supports -o -
> INKSCAPEOPTS += $(call try-run, inkscape -o -,-o -,)
>
> quiet_cmd_logo = LOGO.S $@
> cmd_logo = \
> ( \
> - DISPLAY="" inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \
> + inkscape $(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
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2020-10-12 12:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-11 9:44 Ahmad Fatoum
2020-10-12 12:13 ` Sascha Hauer [this message]
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=20201012121311.GC11648@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=ahmad@a3f.at \
--cc=barebox@lists.infradead.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox