drop scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch from everywhere.

diff --git a/queue-5.10/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch b/queue-5.10/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
deleted file mode 100644 (file)
index 3260d6b..0000000
--- a/queue-5.10/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e2cccc176c7878f4cc0c617f4c47fc698e0fa56b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@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>
-
-[ Upstream commit 87d6576ddf8ac25f36597bc93ca17f6628289c16 ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- scripts/sphinx-pre-install | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
-index 828a8615a9181..b32a20782c851 100755
---- 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);
- 
--- 
-2.34.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index ae770c3616650d90deb2695a291a00b9e6a48182..91a4449c57bfec543e9dcd6261ee1e0a9d3de174 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -404,7 +404,6 @@ serial-pl010-drop-cr-register-reset-on-set_termios.patch
 serial-core-keep-mctrl-register-state-and-cached-cop.patch
 random-do-not-throw-away-excess-input-to-crng_fast_l.patch
 parisc-avoid-calling-faulthandler_disabled-twice.patch
-scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
 x86-kbuild-enable-config_kallsyms_all-y-in-the-defco.patch
 powerpc-6xx-add-missing-of_node_put.patch
 powerpc-powernv-add-missing-of_node_put.patch

diff --git a/queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch b/queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
deleted file mode 100644 (file)
index 4a97cf2..0000000
--- a/queue-5.15/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c177c033e55eb2fc889b5f81a08e6978f55daf40 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@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>
-
-[ Upstream commit 87d6576ddf8ac25f36597bc93ca17f6628289c16 ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- scripts/sphinx-pre-install | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
-index 288e86a9d1e58..61a79ce705ccf 100755
---- a/scripts/sphinx-pre-install
-+++ b/scripts/sphinx-pre-install
-@@ -369,6 +369,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);
- 
--- 
-2.34.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 9c310516144cab496ba2121d7ffd3cbd3d3ffa8f..2c1c39bbc7083ffc888d84d737aa9cef49b23e16 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -615,7 +615,6 @@ random-do-not-throw-away-excess-input-to-crng_fast_l.patch
 net-mlx5-update-log_max_qp-value-to-fw-max-capabilit.patch
 net-mlx5e-unblock-setting-vid-0-for-vf-in-case-pf-is.patch
 parisc-avoid-calling-faulthandler_disabled-twice.patch
-scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
 can-flexcan-allow-to-change-quirks-at-runtime.patch
 can-flexcan-rename-rx-modes.patch
 can-flexcan-add-more-quirks-to-describe-rx-path-capa.patch

diff --git a/queue-5.16/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch b/queue-5.16/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
deleted file mode 100644 (file)
index 76eb127..0000000
--- a/queue-5.16/scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9138b475d8a6e44bffcda7ab1af8b65b386f0b00 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@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>
-
-[ Upstream commit 87d6576ddf8ac25f36597bc93ca17f6628289c16 ]
-
-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: Sasha Levin <sashal@kernel.org>
----
- scripts/sphinx-pre-install | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
-index 288e86a9d1e58..61a79ce705ccf 100755
---- a/scripts/sphinx-pre-install
-+++ b/scripts/sphinx-pre-install
-@@ -369,6 +369,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);
- 
--- 
-2.34.1
-

diff --git a/queue-5.16/series b/queue-5.16/series
index bde10b823789f14405b60b218fe1d7c8d9285dfb..a7c66bb8173c055e7c0933455684cf0bbc724c1b 100644 (file)
--- a/queue-5.16/series
+++ b/queue-5.16/series
@@ -725,7 +725,6 @@ random-do-not-throw-away-excess-input-to-crng_fast_l.patch
 net-mlx5-update-log_max_qp-value-to-fw-max-capabilit.patch
 net-mlx5e-unblock-setting-vid-0-for-vf-in-case-pf-is.patch
 parisc-avoid-calling-faulthandler_disabled-twice.patch
-scripts-sphinx-pre-install-fix-ctex-support-on-debia.patch
 can-flexcan-allow-to-change-quirks-at-runtime.patch
 can-flexcan-rename-rx-modes.patch
 can-flexcan-add-more-quirks-to-describe-rx-path-capa.patch