summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ballance <andrewjballance@gmail.com>2024-01-23 22:39:18 -0600
committerJonathan Corbet <corbet@lwn.net>2024-01-30 14:00:30 -0700
commit36443018a2fa37461baf1aefd2eee10e6dc1c30f (patch)
treeb2dad8ef0901a44b14fd7865de248b71ac7af3f3
parent413971526a90f4639d84a027f7cd65a87958cb3b (diff)
downloadlinux-36443018a2fa37461baf1aefd2eee10e6dc1c30f.tar.gz
linux-36443018a2fa37461baf1aefd2eee10e6dc1c30f.tar.bz2
linux-36443018a2fa37461baf1aefd2eee10e6dc1c30f.zip
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 <andrewjballance@gmail.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/20240124043918.31771-1-andrewjballance@gmail.com
-rwxr-xr-xscripts/sphinx-pre-install9
1 files 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);