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

[Jan Steffens]

    Date: Wednesday, April 8, 2020 @ 08:45:18
  Author: heftig
Revision: 379794

5.6.3.arch1-1

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

-------------------------+
 PKGBUILD                |    8 +++++---
 config                  |    4 ++--
 sphinx-workaround.patch |   13 +++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-08 08:30:45 UTC (rev 379793)
+++ PKGBUILD	2020-04-08 08:45:18 UTC (rev 379794)
@@ -1,8 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgbase=linux
-pkgver=5.6.2.arch1
-pkgrel=2
+pkgver=5.6.3.arch1
+pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
 url="https://git.archlinux.org/linux.git/log/?h=$_srctag"
@@ -18,6 +18,7 @@
 source=(
   "$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag"
   config         # the main kernel config file
+  sphinx-workaround.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -25,7 +26,8 @@
   '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            'e78bfa9f5a1065d93396a37d59043bd79805f4681df27ef44dcddea8de092818')
+            '6ac452e2124f92747a57c5a50e11ca2f1e8112669845b4431311545c7fd2a36c'
+            '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase

Modified: config
===================================================================
--- config	2020-04-08 08:30:45 UTC (rev 379793)
+++ config	2020-04-08 08:45:18 UTC (rev 379794)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.2-arch1 Kernel Configuration
+# Linux/x86 5.6.3-arch1 Kernel Configuration
 #
 
 #
@@ -6683,7 +6683,7 @@
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
-CONFIG_SND_CTL_VALIDATION=y
+# CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_SEQUENCER=m

Added: sphinx-workaround.patch
===================================================================
--- sphinx-workaround.patch	                        (rev 0)
+++ sphinx-workaround.patch	2020-04-08 08:45:18 UTC (rev 379794)
@@ -0,0 +1,13 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 3c7bdf4cd31f..9a0ced58a3e9 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
+               'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
+               'maintainers_include']
+