Re: [PATCH 5.16 0728/1039] scripts: sphinx-pre-install: Fix ctex support on Debian

[Mauro Carvalho Chehab]

Em Tue, 25 Jan 2022 07:48:39 +0900
Akira Yokosawa <akiyks@xxxxxxxxx> escreveu:

> Hi Greg,
> 
> On Mon, 24 Jan 2022 19:41:57 +0100,
> Greg Kroah-Hartman wrote:
> > From: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> > 
> > [ Upstream commit 87d6576ddf8ac25f36597bc93ca17f6628289c16 ]
> > 
> > The name of the package with ctexhook.sty is different on
> > Debian/Ubuntu.
> > 
> > Reported-by: Akira Yokosawa <akiyks@xxxxxxxxx>
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> > Tested-by: Akira Yokosawa <akiyks@xxxxxxxxx>
> > Link: https://lore.kernel.org/r/63882425609a2820fac78f5e94620abeb7ed5f6f.1641429634.git.mchehab@xxxxxxxxxx
> > Signed-off-by: Jonathan Corbet <corbet@xxxxxxx>
> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>  
> 
> This "Fix" is against upstream commit 7baab965896e ("scripts:
> sphinx-pre-install: add required ctex dependency") which is
> also new to v5.17-rc1.
> 
> So I don't think this is worth backporting to stable branches.

Well, either both patches should be backported or none, IMHO.
I guess I would just backport also commit 7baab965896e.

> 
>         Thanks, Akira
> 
> > ---
> >  scripts/sphinx-pre-install | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> > index 288e86a9d1e58..61a79ce705ccf 100755
> > --- a/scripts/sphinx-pre-install
> > +++ b/scripts/sphinx-pre-install
> > @@ -369,6 +369,9 @@ sub give_debian_hints()
> >  	);
> >  
> >  	if ($pdf) {
> > +		check_missing_file(["/usr/share/texlive/texmf-dist/tex/latex/ctex/ctexhook.sty"],
> > +				   "texlive-lang-chinese", 2);
> > +
> >  		check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
> >  				   "fonts-dejavu", 2);
> >    



Thanks,
Mauro