2019-10-02 12:04:06

by Jeremy MAURO

[permalink] [raw]
Subject: [PATCH 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"

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 <[email protected]>
---
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


2019-10-02 12:09:21

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: Re: [PATCH 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"

Em Wed, 2 Oct 2019 11:54:06 +0200
Jeremy MAURO <[email protected]> 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 <[email protected]>
> ---
> 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

2019-10-02 13:43:56

by Jeremy MAURO

[permalink] [raw]
Subject: [PATCH v2 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"

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 <[email protected]>
---
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

2019-10-02 13:48:17

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"

Em Wed, 2 Oct 2019 15:35:42 +0200
Jeremy MAURO <[email protected]> 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 <[email protected]>

Reviewed-by: Mauro Carvalho Chehab <[email protected]>

> ---
> 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

2019-10-03 16:59:45

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] scripts/sphinx-pre-install: Add a new path for the debian package "fonts-noto-cjk"

On Wed, 2 Oct 2019 10:45:04 -0300
Mauro Carvalho Chehab <[email protected]> wrote:

> Em Wed, 2 Oct 2019 15:35:42 +0200
> Jeremy MAURO <[email protected]> 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 <[email protected]>
>
> Reviewed-by: Mauro Carvalho Chehab <[email protected]>

Both patches applied, thanks.

jon