From 3aec573423c23949ae05f801dea0443ef8d89675 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 25 Jan 2022 09:56:16 +0100 Subject: [PATCH] 5.15-stable patches added patches: scripts-sphinx-pre-install-add-required-ctex-dependency.patch scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch --- ...install-add-required-ctex-dependency.patch | 32 +++++++++++++++++ ...e-install-fix-ctex-support-on-debian.patch | 34 +++++++++++++++++++ queue-5.15/series | 2 ++ 3 files changed, 68 insertions(+) create mode 100644 queue-5.15/scripts-sphinx-pre-install-add-required-ctex-dependency.patch create mode 100644 queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch diff --git a/queue-5.15/scripts-sphinx-pre-install-add-required-ctex-dependency.patch b/queue-5.15/scripts-sphinx-pre-install-add-required-ctex-dependency.patch new file mode 100644 index 00000000000..08b475d4513 --- /dev/null +++ b/queue-5.15/scripts-sphinx-pre-install-add-required-ctex-dependency.patch @@ -0,0 +1,32 @@ +From 7baab965896eaeea60a54b8fe742feea2f79060f Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Mon, 3 Jan 2022 22:01:57 +0100 +Subject: scripts: sphinx-pre-install: add required ctex dependency + +From: Mauro Carvalho Chehab + +commit 7baab965896eaeea60a54b8fe742feea2f79060f upstream. + +After a change meant to fix support for oriental characters +(Chinese, Japanese, Korean), ctex stylesheet is now a requirement +for PDF output. + +Reported-by: Christoph Hellwig +Signed-off-by: Mauro Carvalho Chehab +Link: https://lore.kernel.org/r/165aa6167f21e3892a6e308688c93c756e94f4e0.1641243581.git.mchehab@kernel.org +Signed-off-by: Jonathan Corbet +Signed-off-by: Greg Kroah-Hartman +--- + scripts/sphinx-pre-install | 1 + + 1 file changed, 1 insertion(+) + +--- a/scripts/sphinx-pre-install ++++ b/scripts/sphinx-pre-install +@@ -78,6 +78,7 @@ my %texlive = ( + 'ucs.sty' => 'texlive-ucs', + 'upquote.sty' => 'texlive-upquote', + 'wrapfig.sty' => 'texlive-wrapfig', ++ 'ctexhook.sty' => 'texlive-ctex', + ); + + # diff --git a/queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch b/queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch new file mode 100644 index 00000000000..9790315a773 --- /dev/null +++ b/queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch @@ -0,0 +1,34 @@ +From 87d6576ddf8ac25f36597bc93ca17f6628289c16 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Thu, 6 Jan 2022 01:41:02 +0100 +Subject: scripts: sphinx-pre-install: Fix ctex support on Debian + +From: Mauro Carvalho Chehab + +commit 87d6576ddf8ac25f36597bc93ca17f6628289c16 upstream. + +The name of the package with ctexhook.sty is different on +Debian/Ubuntu. + +Reported-by: Akira Yokosawa +Signed-off-by: Mauro Carvalho Chehab +Tested-by: Akira Yokosawa +Link: https://lore.kernel.org/r/63882425609a2820fac78f5e94620abeb7ed5f6f.1641429634.git.mchehab@kernel.org +Signed-off-by: Jonathan Corbet +Signed-off-by: Greg Kroah-Hartman +--- + scripts/sphinx-pre-install | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/scripts/sphinx-pre-install ++++ b/scripts/sphinx-pre-install +@@ -370,6 +370,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); + diff --git a/queue-5.15/series b/queue-5.15/series index 74cdbc3e8a5..624bf7845dc 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -841,3 +841,5 @@ lib82596-fix-irq-check-in-sni_82596_probe.patch mm-hmm.c-allow-vm_mixedmap-to-work-with-hmm_range_fault.patch bonding-fix-extraction-of-ports-from-the-packet-headers.patch lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch +scripts-sphinx-pre-install-add-required-ctex-dependency.patch +scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch -- 2.47.2