mirror of
https://codeberg.org/openpgp/notes.git
synced 2024-11-21 23:22:05 +01:00
drop our sphinx patch
Fixed by https://github.com/sphinx-doc/sphinx/pull/11766
This commit is contained in:
parent
1fbc84cb06
commit
275de6249d
3 changed files with 0 additions and 29 deletions
|
@ -19,6 +19,4 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- pacman -Sy --needed --noconfirm archlinux-keyring
|
- pacman -Sy --needed --noconfirm archlinux-keyring
|
||||||
- pacman -Syu --needed --noconfirm epubcheck inkscape noto-fonts make patch python-myst-parser python-sphinx python-sphinxext-opengraph python-sphinx-sitemap ttf-montserrat
|
- pacman -Syu --needed --noconfirm epubcheck inkscape noto-fonts make patch python-myst-parser python-sphinx python-sphinxext-opengraph python-sphinx-sitemap ttf-montserrat
|
||||||
# fix sphinx: https://github.com/sphinx-doc/sphinx/issues/11598
|
|
||||||
- patch -Np1 -d /usr/lib/python3.11/site-packages/ -i "$(pwd)/book/patches/sphinx-11766.patch"
|
|
||||||
- make -C book epub-check
|
- make -C book epub-check
|
||||||
|
|
|
@ -8,7 +8,6 @@ WORKDIR /book
|
||||||
RUN \
|
RUN \
|
||||||
pacman -Sy --needed --noconfirm archlinux-keyring \
|
pacman -Sy --needed --noconfirm archlinux-keyring \
|
||||||
&& pacman -Syu --needed --noconfirm inkscape make noto-fonts patch python-myst-parser python-sphinx python-sphinxext-opengraph python-sphinx-sitemap ttf-montserrat \
|
&& pacman -Syu --needed --noconfirm inkscape make noto-fonts patch python-myst-parser python-sphinx python-sphinxext-opengraph python-sphinx-sitemap ttf-montserrat \
|
||||||
&& patch -Np1 -d /usr/lib/python3.11/site-packages/ -i /book/patches/sphinx-11766.patch \
|
|
||||||
&& make epub html
|
&& make epub html
|
||||||
|
|
||||||
FROM scratch
|
FROM scratch
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
diff --git a/sphinx/builders/html/__init__.py b/sphinx/builders/html/__init__.py
|
|
||||||
index 85067be0178..91d3647597c 100644
|
|
||||||
--- a/sphinx/builders/html/__init__.py
|
|
||||||
+++ b/sphinx/builders/html/__init__.py
|
|
||||||
@@ -1061,7 +1061,9 @@ def css_tag(css: _CascadingStyleSheet) -> str:
|
|
||||||
attrs.append(f'{key}="{html.escape(value, quote=True)}"')
|
|
||||||
uri = pathto(os.fspath(css.filename), resource=True)
|
|
||||||
if checksum := _file_checksum(outdir, css.filename):
|
|
||||||
- uri += f'?v={checksum}'
|
|
||||||
+ # the EPUB format does not allow the use of query components
|
|
||||||
+ if self.name != 'epub':
|
|
||||||
+ uri += f'?v={checksum}'
|
|
||||||
return f'<link {" ".join(sorted(attrs))} href="{uri}" />'
|
|
||||||
|
|
||||||
ctx['css_tag'] = css_tag
|
|
||||||
@@ -1092,7 +1094,9 @@ def js_tag(js: _JavaScript | str) -> str:
|
|
||||||
# https://github.com/sphinx-doc/sphinx/issues/11658
|
|
||||||
pass
|
|
||||||
elif checksum := _file_checksum(outdir, js.filename):
|
|
||||||
- uri += f'?v={checksum}'
|
|
||||||
+ # the EPUB format does not allow the use of query components
|
|
||||||
+ if self.name != 'epub':
|
|
||||||
+ uri += f'?v={checksum}'
|
|
||||||
if attrs:
|
|
||||||
return f'<script {" ".join(sorted(attrs))} src="{uri}"></script>'
|
|
||||||
return f'<script src="{uri}"></script>'
|
|
Loading…
Reference in a new issue