[arch-commits] Commit in linux/trunk (PKGBUILD config sphinx-workaround.patch)

[Jan Steffens via arch-commits]

    Date: Sunday, March 7, 2021 @ 18:34:36
  Author: heftig
Revision: 409477

5.11.4.arch1-1

Modified:
  linux/trunk/PKGBUILD
  linux/trunk/config
Deleted:
  linux/trunk/sphinx-workaround.patch

-------------------------+
 PKGBUILD                |    6 ++----
 config                  |    2 +-
 sphinx-workaround.patch |   19 -------------------
 3 files changed, 3 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-03-07 18:31:34 UTC (rev 409476)
+++ PKGBUILD    2021-03-07 18:34:36 UTC (rev 409477)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
 
 pkgbase=linux
-pkgver=5.11.3.arch1
+pkgver=5.11.4.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -18,7 +18,6 @@
 source=(
   "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag";
   config         # the main kernel config file
-  sphinx-workaround.patch  # Sphinx 3.5 broke the build again
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -26,8 +25,7 @@
   'A2FF3A36AAA56654109064AB19802F8B0D70FC30'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            '55394d9cee73413c06e332005e1af4d6e22d97cd7d915721f2edb424d61cc3b5'
-            '52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb')
+            '0c4c3b90f011cac0973d65031d12c518da831d4563fee6ae60ee06929fe0bc81')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase

Modified: config
===================================================================
--- config      2021-03-07 18:31:34 UTC (rev 409476)
+++ config      2021-03-07 18:34:36 UTC (rev 409477)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.11.3-arch1 Kernel Configuration
+# Linux/x86 5.11.4-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y

Deleted: sphinx-workaround.patch
===================================================================
--- sphinx-workaround.patch     2021-03-07 18:31:34 UTC (rev 409476)
+++ sphinx-workaround.patch     2021-03-07 18:34:36 UTC (rev 409477)
@@ -1,19 +0,0 @@
-diff --git i/Documentation/conf.py w/Documentation/conf.py
-index 6a767294887e..d1d145759fed 100644
---- i/Documentation/conf.py
-+++ w/Documentation/conf.py
-@@ -267,11 +267,9 @@ except ImportError:
- 
- html_static_path = ['sphinx-static']
- 
--html_context = {
--    'css_files': [
--        '_static/theme_overrides.css',
--    ],
--}
-+html_css_files = [
-+    '_static/theme_overrides.css',
-+]
- 
- # Add any extra paths that contain custom files (such as robots.txt or
- # .htaccess) here, relative to this directory. These files are copied