From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRwbh-00074a-P3 for barebox@lists.infradead.org; Mon, 12 Oct 2020 12:07:14 +0000 Date: Mon, 12 Oct 2020 14:07:10 +0200 From: Sascha Hauer Message-ID: <20201012120710.GB11648@pengutronix.de> References: <20201011080625.470522-1-ahmad@a3f.at> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201011080625.470522-1-ahmad@a3f.at> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH master] logo: Makefile: fix inkscape Wayland GUI opening on LOGO.S To: Ahmad Fatoum Cc: barebox@lists.infradead.org On Sun, Oct 11, 2020 at 10:06:25AM +0200, Ahmad Fatoum wrote: > 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 > --- > Cc: Antony Pavlov > > Hello Sascha, > > can this be applied to master? > --- Yep, did that. Sascha > 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 > -- 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