[arch-commits] Commit in linux-docs/repos/testing-any (3 files)

[Anatol Pomozov]

    Date: Wednesday, September 30, 2020 @ 19:34:48
  Author: anatolik
Revision: 397008

archrelease: copy trunk to testing-any

Added:
  linux-docs/repos/testing-any/PKGBUILD
    (from rev 397007, linux-docs/trunk/PKGBUILD)
  linux-docs/repos/testing-any/sphinx-workaround.patch
    (from rev 397007, linux-docs/trunk/sphinx-workaround.patch)
Deleted:
  linux-docs/repos/testing-any/PKGBUILD

-------------------------+
 PKGBUILD                |   65 +++++++++++++++++++++++++---------------------
 sphinx-workaround.patch |   13 +++++++++
 2 files changed, 49 insertions(+), 29 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-30 19:34:25 UTC (rev 397007)
+++ PKGBUILD	2020-09-30 19:34:48 UTC (rev 397008)
@@ -1,29 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=linux-docs
-pkgver=5.4
-pkgrel=1
-pkgdesc="Kernel hacker's manual"
-url="https://www.kernel.org/doc/html/latest/"
-arch=(any)
-license=(GPL2)
-makedepends=(xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick)
-source=(https://www.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.{xz,sign})
-sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
-            'SKIP')
-validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
-              '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
-
-build() {
-  make -C linux-$pkgver htmldocs BUILDDIR="$srcdir/html"
-}
-
-package() {
-  mkdir -p "$pkgdir"/usr/share/doc/linux/{txt,html}
-
-  # Skip hidden files (no dotglob)
-  cp -r linux-$pkgver/Documentation/* "$pkgdir/usr/share/doc/linux/txt"
-  cp -r html/* "$pkgdir/usr/share/doc/linux/html"
-}
-
-# vim:set sw=2 et:

Copied: linux-docs/repos/testing-any/PKGBUILD (from rev 397007, linux-docs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-30 19:34:48 UTC (rev 397008)
@@ -0,0 +1,36 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=linux-docs
+pkgver=5.8
+pkgrel=1
+pkgdesc="Kernel hacker's manual"
+url="https://www.kernel.org/doc/html/latest/"
+arch=(any)
+license=(GPL2)
+makedepends=(xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick)
+source=(https://www.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.{xz,sign}
+        sphinx-workaround.patch)
+sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
+            'SKIP'
+            '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
+validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
+              '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
+
+prepare() {
+  cd linux-$pkgver
+  patch -p1 < ../sphinx-workaround.patch # https://bugs.archlinux.org/task/66156
+}
+
+build() {
+  make -C linux-$pkgver htmldocs BUILDDIR="$srcdir/html"
+}
+
+package() {
+  mkdir -p "$pkgdir"/usr/share/doc/linux/{txt,html}
+
+  # Skip hidden files (no dotglob)
+  cp -r linux-$pkgver/Documentation/* "$pkgdir/usr/share/doc/linux/txt"
+  cp -r html/* "$pkgdir/usr/share/doc/linux/html"
+}
+
+# vim:set sw=2 et:

Copied: linux-docs/repos/testing-any/sphinx-workaround.patch (from rev 397007, linux-docs/trunk/sphinx-workaround.patch)
===================================================================
--- sphinx-workaround.patch	                        (rev 0)
+++ sphinx-workaround.patch	2020-09-30 19:34:48 UTC (rev 397008)
@@ -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']
+