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

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 (file)
index 0000000..08b475d
--- /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 <mchehab@kernel.org>
+Date: Mon, 3 Jan 2022 22:01:57 +0100
+Subject: scripts: sphinx-pre-install: add required ctex dependency
+
+From: Mauro Carvalho Chehab <mchehab@kernel.org>
+
+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 <hch@lst.de>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Link: https://lore.kernel.org/r/165aa6167f21e3892a6e308688c93c756e94f4e0.1641243581.git.mchehab@kernel.org
+Signed-off-by: Jonathan Corbet <corbet@lwn.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 (file)
index 0000000..9790315
--- /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 <mchehab@kernel.org>
+Date: Thu, 6 Jan 2022 01:41:02 +0100
+Subject: scripts: sphinx-pre-install: Fix ctex support on Debian
+
+From: Mauro Carvalho Chehab <mchehab@kernel.org>
+
+commit 87d6576ddf8ac25f36597bc93ca17f6628289c16 upstream.
+
+The name of the package with ctexhook.sty is different on
+Debian/Ubuntu.
+
+Reported-by: Akira Yokosawa <akiyks@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Tested-by: Akira Yokosawa <akiyks@gmail.com>
+Link: https://lore.kernel.org/r/63882425609a2820fac78f5e94620abeb7ed5f6f.1641429634.git.mchehab@kernel.org
+Signed-off-by: Jonathan Corbet <corbet@lwn.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 74cdbc3e8a5491d48758e085aa9c3417afce72f0..624bf7845dccfdb40481f9d4fc043969edc0be00 100644 (file)
--- 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