2024-01-24 04:46:05

by Andrew Ballance

Subject: [PATCH] docs: sphinx-pre-install fix-noto-sans-cjk on fedora

fedora 38 and later changed the directory and package name that
provides NotoSansCJK-Regular.ttc. this adds the new search path and
suggests the correct package if on fedora 38 or later.

Signed-off-by: Andrew Ballance <[email protected]>
---
scripts/sphinx-pre-install | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 25aefbb35377..948f284bfc8b 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -421,6 +421,7 @@ sub give_redhat_hints()
#
my $old = 0;
my $rel;
+ my $noto_sans_redhat = "google-noto-sans-cjk-ttc-fonts";
$rel = $1 if ($system_release =~ /release\s+(\d+)/);

if (!($system_release =~ /Fedora/)) {
@@ -438,6 +439,9 @@ sub give_redhat_hints()
if ($rel && $rel < 26) {
$old = 1;
}
+ if ($rel && $rel >= 38) {
+ $noto_sans_redhat = "google-noto-sans-cjk-fonts";
+ }
}
if (!$rel) {
printf("Couldn't identify release number\n");
@@ -446,8 +450,9 @@ sub give_redhat_hints()
}

if ($pdf) {
- check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
- "google-noto-sans-cjk-ttc-fonts", 2);
+ check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+ "/usr/share/fonts/google-noto-sans-cjk-fonts/NotoSansCJK-Regular.ttc"],
+ $noto_sans_redhat, 2);
}

check_rpm_missing(\@fedora26_opt_pkgs, 2) if ($pdf && !$old);
--
2.43.0

2024-01-30 21:01:29

by Jonathan Corbet

Subject: Re: [PATCH] docs: sphinx-pre-install fix-noto-sans-cjk on fedora

Andrew Ballance <[email protected]> writes:

> fedora 38 and later changed the directory and package name that
> provides NotoSansCJK-Regular.ttc. this adds the new search path and
> suggests the correct package if on fedora 38 or later.
>
> Signed-off-by: Andrew Ballance <[email protected]>
> ---
> scripts/sphinx-pre-install | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)

Applied, thanks.

jon