linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"
@ 2019-10-02  9:54 Jeremy MAURO
  2019-10-02 10:36 ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 5+ messages in thread
From: Jeremy MAURO @ 2019-10-02  9:54 UTC (permalink / raw)
  To: j.mauro
  Cc: Mauro Carvalho Chehab, Jonathan Corbet,
	open list:DOCUMENTATION SCRIPTS, open list

The latest debian version "bullseye/sid" has changed the path of the file
"notoserifcjk-regular.ttc", with the previous change and this change we
keep the backward compatibility and add the latest debian version

Signed-off-by: Jeremy MAURO <j.mauro@criteo.com>
---
 scripts/sphinx-pre-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index b5077ae63a4b..b5da4202155b 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -348,7 +348,8 @@ sub give_debian_hints()
 		check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
 				   "fonts-dejavu", 2);
 
-		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
+		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+			"/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc"],
 				   "fonts-noto-cjk", 2);
 	}
 
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"
  2019-10-02  9:54 [PATCH 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk" Jeremy MAURO
@ 2019-10-02 10:36 ` Mauro Carvalho Chehab
  2019-10-02 13:35   ` [PATCH v2 " Jeremy MAURO
  0 siblings, 1 reply; 5+ messages in thread
From: Mauro Carvalho Chehab @ 2019-10-02 10:36 UTC (permalink / raw)
  To: Jeremy MAURO
  Cc: j.mauro, Jonathan Corbet, open list:DOCUMENTATION SCRIPTS, open list

Em Wed,  2 Oct 2019 11:54:06 +0200
Jeremy MAURO <jeremy.mauro@gmail.com> escreveu:

> The latest debian version "bullseye/sid" has changed the path of the file
> "notoserifcjk-regular.ttc", with the previous change and this change we
> keep the backward compatibility and add the latest debian version
> 
> Signed-off-by: Jeremy MAURO <j.mauro@criteo.com>
> ---
>  scripts/sphinx-pre-install | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index b5077ae63a4b..b5da4202155b 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -348,7 +348,8 @@ sub give_debian_hints()
>  		check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
>  				   "fonts-dejavu", 2);
>  
> -		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
> +		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> +			"/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc"],
>  				   "fonts-noto-cjk", 2);

Please align the second line, e. g:

		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
				    "/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc"],
 				   "fonts-noto-cjk", 2);



>  	}
>  



Thanks,
Mauro

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"
  2019-10-02 10:36 ` Mauro Carvalho Chehab
@ 2019-10-02 13:35   ` Jeremy MAURO
  2019-10-02 13:45     ` Mauro Carvalho Chehab
  0 siblings, 1 reply; 5+ messages in thread
From: Jeremy MAURO @ 2019-10-02 13:35 UTC (permalink / raw)
  Cc: j.mauro, Mauro Carvalho Chehab, Jonathan Corbet,
	open list:DOCUMENTATION SCRIPTS, open list

The latest debian version "bullseye/sid" has changed the path of the file
"notoserifcjk-regular.ttc", with the previous change and this change we
keep the backward compatibility and add the latest debian version

Signed-off-by: Jeremy MAURO <j.mauro@criteo.com>
---
Changes in V2:
- Align all lines

 scripts/sphinx-pre-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index b5077ae63a4b..1f9285274587 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -348,7 +348,8 @@ sub give_debian_hints()
 		check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
 				   "fonts-dejavu", 2);
 
-		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
+		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+				   "/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc"],
 				   "fonts-noto-cjk", 2);
 	}
 
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v2 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"
  2019-10-02 13:35   ` [PATCH v2 " Jeremy MAURO
@ 2019-10-02 13:45     ` Mauro Carvalho Chehab
  2019-10-03 16:49       ` Jonathan Corbet
  0 siblings, 1 reply; 5+ messages in thread
From: Mauro Carvalho Chehab @ 2019-10-02 13:45 UTC (permalink / raw)
  To: Jeremy MAURO
  Cc: j.mauro, Jonathan Corbet, open list:DOCUMENTATION SCRIPTS, open list

Em Wed,  2 Oct 2019 15:35:42 +0200
Jeremy MAURO <jeremy.mauro@gmail.com> escreveu:

> The latest debian version "bullseye/sid" has changed the path of the file
> "notoserifcjk-regular.ttc", with the previous change and this change we
> keep the backward compatibility and add the latest debian version
> 
> Signed-off-by: Jeremy MAURO <j.mauro@criteo.com>

Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

> ---
> Changes in V2:
> - Align all lines
> 
>  scripts/sphinx-pre-install | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index b5077ae63a4b..1f9285274587 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -348,7 +348,8 @@ sub give_debian_hints()
>  		check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
>  				   "fonts-dejavu", 2);
>  
> -		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
> +		check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> +				   "/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc"],
>  				   "fonts-noto-cjk", 2);
>  	}
>  



Thanks,
Mauro

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"
  2019-10-02 13:45     ` Mauro Carvalho Chehab
@ 2019-10-03 16:49       ` Jonathan Corbet
  0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Corbet @ 2019-10-03 16:49 UTC (permalink / raw)
  To: Mauro Carvalho Chehab
  Cc: Jeremy MAURO, j.mauro, open list:DOCUMENTATION SCRIPTS, open list

On Wed, 2 Oct 2019 10:45:04 -0300
Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:

> Em Wed,  2 Oct 2019 15:35:42 +0200
> Jeremy MAURO <jeremy.mauro@gmail.com> escreveu:
> 
> > The latest debian version "bullseye/sid" has changed the path of the file
> > "notoserifcjk-regular.ttc", with the previous change and this change we
> > keep the backward compatibility and add the latest debian version
> > 
> > Signed-off-by: Jeremy MAURO <j.mauro@criteo.com>  
> 
> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

Both patches applied, thanks.

jon

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-10-03 16:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-02  9:54 [PATCH 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk" Jeremy MAURO
2019-10-02 10:36 ` Mauro Carvalho Chehab
2019-10-02 13:35   ` [PATCH v2 " Jeremy MAURO
2019-10-02 13:45     ` Mauro Carvalho Chehab
2019-10-03 16:49       ` Jonathan Corbet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).