From: Greg Kroah-Hartman Date: Tue, 25 Jan 2022 08:56:05 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.4.300~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f6565ecad17b4f3a6721656b45326cd23ce21f5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: scripts-sphinx-pre-install-add-required-ctex-dependency.patch scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch --- diff --git a/queue-5.10/scripts-sphinx-pre-install-add-required-ctex-dependency.patch b/queue-5.10/scripts-sphinx-pre-install-add-required-ctex-dependency.patch new file mode 100644 index 00000000000..f3a7e867b87 --- /dev/null +++ b/queue-5.10/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 +@@ -76,6 +76,7 @@ my %texlive = ( + 'ucs.sty' => 'texlive-ucs', + 'upquote.sty' => 'texlive-upquote', + 'wrapfig.sty' => 'texlive-wrapfig', ++ 'ctexhook.sty' => 'texlive-ctex', + ); + + # diff --git a/queue-5.10/scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch b/queue-5.10/scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch new file mode 100644 index 00000000000..beccf16bbd1 --- /dev/null +++ b/queue-5.10/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 +@@ -371,6 +371,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.10/series b/queue-5.10/series index 91a4449c57b..0d56b913587 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -560,3 +560,5 @@ mm-hmm.c-allow-vm_mixedmap-to-work-with-hmm_range_fault.patch lib-test_meminit-destroy-cache-in-kmem_cache_alloc_bulk-test.patch mtd-nand-bbt-fix-corner-case-in-bad-block-table-handling.patch ath10k-fix-the-mtu-size-on-qca9377-sdio.patch +scripts-sphinx-pre-install-add-required-ctex-dependency.patch +scripts-sphinx-pre-install-fix-ctex-support-on-debian.patch