Date: Monday, January 16, 2023 @ 18:49:27 Author: freswa Revision: 466775
upgpkg: linux-rt 6.0.5.14.realtime1-3: binutils 2.40 rebuild Added: linux-rt/trunk/fix-docgen.patch Modified: linux-rt/trunk/PKGBUILD ------------------+ PKGBUILD | 9 ++++++--- fix-docgen.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-16 18:33:22 UTC (rev 466774) +++ PKGBUILD 2023-01-16 18:49:27 UTC (rev 466775) @@ -3,7 +3,7 @@ pkgbase=linux-rt pkgver=6.0.5.14.realtime1 -pkgrel=2 +pkgrel=3 pkgdesc='Linux RT' arch=(x86_64) url="https://gitlab.archlinux.org/archlinux/packaging/upstream/linux-rt/-/commits/v$pkgver"; @@ -14,11 +14,14 @@ source=( git+https://gitlab.archlinux.org/archlinux/packaging/upstream/linux-rt#tag=v$pkgver?signed config + fix-docgen.patch::https://github.com/archlinux/linux/commit/a3b216b0a5c2628624de605599aa6c16675578de.patch ) sha512sums=('SKIP' - '6da33aa6a1584b3ce035774f093c86319dd9a078e06c5322fc637557a141f6ac5a666fd1a49d693ec11f4a7256228cf62af020754d1784257a25d4829440f119') + '6da33aa6a1584b3ce035774f093c86319dd9a078e06c5322fc637557a141f6ac5a666fd1a49d693ec11f4a7256228cf62af020754d1784257a25d4829440f119' + '8c0f0fa346863824c304e6af75488002f2c362c797d422dae5b7472cca86585484ade2cd82d041118ab36fc03ff549d891c0e6aeb892a0a22616b1d696427a11') b2sums=('SKIP' - '1b4498168620f6e8f008818ba54b40b18853926f60b10946ae50aca9d30f62816a0fd6d6083163926c824e055efb7716f91ba4eacbc8a929619337b54818be29') + '1b4498168620f6e8f008818ba54b40b18853926f60b10946ae50aca9d30f62816a0fd6d6083163926c824e055efb7716f91ba4eacbc8a929619337b54818be29' + 'cc6ded22fb6d03376af12b322697dab117ee76b60a18935188f7b7bc9af862269ad05790593e1873e84e735eedeb2f8ed4b91aece05ef9a419392c44bb53edcd') validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman <[email protected]> '64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior Added: fix-docgen.patch =================================================================== --- fix-docgen.patch (rev 0) +++ fix-docgen.patch 2023-01-16 18:49:27 UTC (rev 466775) @@ -0,0 +1,45 @@ +From a3b216b0a5c2628624de605599aa6c16675578de Mon Sep 17 00:00:00 2001 +From: Jonathan Corbet <[email protected]> +Date: Wed, 4 Jan 2023 13:45:35 -0700 +Subject: [PATCH] docs: Fix the docs build with Sphinx 6.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Sphinx 6.0 removed the execfile_() function, which we use as part of the +configuration process. They *did* warn us... Just open-code the +functionality as is done in Sphinx itself. + +Tested (using SPHINX_CONF, since this code is only executed with an +alternative config file) on various Sphinx versions from 2.5 through 6.0. + +Reported-by: Martin Liška <[email protected]> +Signed-off-by: Jonathan Corbet <[email protected]> +--- + Documentation/sphinx/load_config.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py +index eeb394b39e2cc8..8b416bfd75ac17 100644 +--- a/Documentation/sphinx/load_config.py ++++ b/Documentation/sphinx/load_config.py +@@ -3,7 +3,7 @@ + + import os + import sys +-from sphinx.util.pycompat import execfile_ ++from sphinx.util.osutil import fs_encoding + + # ------------------------------------------------------------------------------ + def loadConfig(namespace): +@@ -48,7 +48,9 @@ def loadConfig(namespace): + sys.stdout.write("load additional sphinx-config: %s\n" % config_file) + config = namespace.copy() + config['__file__'] = config_file +- execfile_(config_file, config) ++ with open(config_file, 'rb') as f: ++ code = compile(f.read(), fs_encoding, 'exec') ++ exec(code, config) + del config['__file__'] + namespace.update(config) + else:
