#5 Fix for Sphinx 4.1+, backported from upstream
Merged 9 months ago by churchyard. Opened 9 months ago by churchyard.
rpms/ churchyard/python-sphinx_rtd_theme sphinx-4.1  into  rawhide

file added
+40
@@ -0,0 +1,40 @@ 

+ From 2ab605a455960523bf56bb305e254db3ebc5d00c Mon Sep 17 00:00:00 2001

+ From: Aaron Carlisle <carlisle.b3d@gmail.com>

+ Date: Tue, 13 Jul 2021 05:16:47 -0400

+ Subject: [PATCH] Tests: Fix deprecation warning with new sphinx versions

+  (#1105)

+ 

+ * Tests: Fix deprecation warning with new sphinx versions

+ 

+ These builders where split in sphinx and the old import path will be removed in the upcoming Sphinx 4 release.

+ 

+ This patch requires sphinx 2 so this will be committed into the v2 release.

+ 

+ * Fix imports

+ 

+ * Use try/except for backwards compatibility

+ ---

+  tests/test_builders.py | 10 +++++++++-

+  1 file changed, 9 insertions(+), 1 deletion(-)

+ 

+ diff --git a/tests/test_builders.py b/tests/test_builders.py

+ index ce8fb3cc1..d3d3c51b7 100644

+ --- a/tests/test_builders.py

+ +++ b/tests/test_builders.py

+ @@ -3,7 +3,15 @@

+  import pytest

+  import sphinx

+  from sphinx import addnodes

+ -from sphinx.builders.html import SingleFileHTMLBuilder, DirectoryHTMLBuilder

+ +try:

+ +    # Available from Sphinx 2.0

+ +    from sphinx.builders.dirhtml import DirectoryHTMLBuilder

+ +    from sphinx.builders.singlehtml import SingleFileHTMLBuilder

+ +except ImportError:

+ +    from sphinx.builders.html import (

+ +        DirectoryHTMLBuilder,

+ +        SingleFileHTMLBuilder,

+ +    )

+  

+  from .util import build_all

+  

@@ -1,5 +1,5 @@ 

- --- package.json.orig	2020-06-17 09:58:25.000000000 -0600

- +++ package.json	2020-12-10 08:27:04.247691945 -0700

+ --- a/package.json

+ +++ b/package.json

  @@ -16,7 +16,6 @@

       "css-loader": "^3.1.0",

       "file-loader": "^3.0.1",
@@ -8,8 +8,8 @@ 

       "imports-loader": "^0.8.0",

       "jquery": "^3.4.1",

       "lato-font": "^3.0.0",

- --- package-lock.json.orig	2020-06-17 09:58:25.000000000 -0600

- +++ package-lock.json	2020-12-10 08:27:28.658644927 -0700

+ --- a/package-lock.json

+ +++ b/package-lock.json

  @@ -3614,12 +3614,6 @@

         "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",

         "dev": true
@@ -23,8 +23,8 @@ 

       "http-deceiver": {

         "version": "1.2.7",

         "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",

- --- sphinx_rtd_theme/layout.html.orig	2020-06-17 09:58:25.000000000 -0600

- +++ sphinx_rtd_theme/layout.html	2020-12-10 08:28:12.607551700 -0700

+ --- a/sphinx_rtd_theme/layout.html

+ +++ b/sphinx_rtd_theme/layout.html

  @@ -45,9 +45,6 @@

   

     {# JAVASCRIPTS #}
@@ -35,8 +35,8 @@ 

     {%- if not embedded %}

     {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}

       {% if sphinx_version >= "1.8.0" %}

- --- webpack.common.js.orig	2020-06-17 09:58:25.000000000 -0600

- +++ webpack.common.js	2020-12-10 08:26:44.191730575 -0700

+ --- a/webpack.common.js

+ +++ b/webpack.common.js

  @@ -1,6 +1,5 @@

   const path = require("path");

   const MiniCssExtractPlugin = require("mini-css-extract-plugin");

@@ -1,5 +1,5 @@ 

- --- MANIFEST.in.orig	2021-01-04 15:13:31.000000000 -0700

- +++ MANIFEST.in	2021-01-04 16:21:38.547029407 -0700

+ --- a/MANIFEST.in

+ +++ b/MANIFEST.in

  @@ -4,13 +4,8 @@ include LICENSE

   include bin/preinstall.js

   recursive-include sphinx_rtd_theme *.conf
@@ -14,14 +14,14 @@ 

   recursive-include sphinx_rtd_theme/locale *.pot *.po *.mo

   recursive-include tests *.py

   recursive-include tests *.rst

- --- sphinx_rtd_theme/static/css/badge_only.css.orig	2021-01-04 15:13:31.000000000 -0700

- +++ sphinx_rtd_theme/static/css/badge_only.css	2021-01-04 16:21:38.547029407 -0700

+ --- a/sphinx_rtd_theme/static/css/badge_only.css

+ +++ b/sphinx_rtd_theme/static/css/badge_only.css

  @@ -1 +1 @@

  -.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}

  \ No newline at end of file

  +.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:local("fontawesome/FontAwesome") format("truetype")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}

- --- sphinx_rtd_theme/static/css/theme.css.orig	2021-01-04 15:13:31.000000000 -0700

- +++ sphinx_rtd_theme/static/css/theme.css	2021-01-04 16:21:38.552029396 -0700

+ --- a/sphinx_rtd_theme/static/css/theme.css

+ +++ b/sphinx_rtd_theme/static/css/theme.css

  @@ -1,4 +1,4 @@

   html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden],audio:not([controls]){display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;text-decoration:none}ins,mark{color:#000}mark{background:#ff0;font-style:italic;font-weight:700}.rst-content code,.rst-content tt,code,kbd,pre,samp{font-family:monospace,serif;_font-family:courier new,monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:after,q:before{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,ol,ul{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure,form{margin:0}label{cursor:pointer}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type=button],input[type=reset],input[type=submit]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}textarea{resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none!important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{body,html,section{background:none!important}*{box-shadow:none!important;text-shadow:none!important;filter:none!important;-ms-filter:none!important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}.rst-content .toctree-wrapper>p.caption,h2,h3,p{orphans:3;widows:3}.rst-content .toctree-wrapper>p.caption,h2,h3{page-break-after:avoid}}.btn,.fa:before,.icon:before,.rst-content .admonition,.rst-content .admonition-title:before,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .code-block-caption .headerlink:before,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning,.rst-content code.download span:first-child:before,.rst-content dl dt .headerlink:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.wy-alert,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-menu-vertical li.current>a,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li span.toctree-expand:before,.wy-nav-top a,.wy-side-nav-search .wy-dropdown>a,.wy-side-nav-search>a,input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select,textarea{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}/*!

    *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome

file modified
+8 -2
@@ -5,7 +5,7 @@ 

  

  Name:           python-%{srcname}

  Version:        0.5.2

- Release:        4%{?dist}

+ Release:        5%{?dist}

  Summary:        Sphinx theme for readthedocs.org

  

  License:        MIT
@@ -20,6 +20,9 @@ 

  # Unbundle fonts.  Refer to local fonts instead.

  Patch1:         %{name}-unbundle-fonts.patch

  

+ # Fix for Sphinx 4.1+, backported from upstream

+ Patch2:         https://github.com/readthedocs/sphinx_rtd_theme/commit/2ab605a455.patch

+ 

  BuildArch:      noarch

  

  BuildRequires:  font(fontawesome)
@@ -68,7 +71,7 @@ 

  %endif

  

  %prep

- %autosetup -p0 -n %{srcname}-%{version}

+ %autosetup -p1 -n %{srcname}-%{version}

  

  # Use local objects.inv for intersphinx

  sed -e "s|\('https://docs\.readthedocs\.io/en/latest/', \)None|\1'%{SOURCE1}'|" \
@@ -139,6 +142,9 @@ 

  %endif

  

  %changelog

+ * Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 0.5.2-5

+ - Fix for Sphinx 4.1+

+ 

  * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

Looking good, I checked the theme on my test project and all runs smoothly.

I can't get around the number in %autosetup -p[01] - what does it relate to? I can see there are now three patches that don't get applied if -p0 is given as an argument, but the apply cleanly if it's -p1.

It's the -p argument for patch: it controls how file names found in the patch file are treated, in case you keep your files in a different directory than the person who sent out the patch.

Git uses -p1 patches (paths start with a/ and b/). The pre-existing patches here used -p0 (paths without prefix, original with .orig suffix). In order to keep using %autosetup, the -p value must be consistent across patches. In the first commit, I've converted the per-existing patches to -p1 for easier git backports.

Pull-Request has been merged by churchyard

9 months ago