[dpdk-stable] patch 'doc: fix sphinx compatibility' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From c4d52beff82ecca2211c99f9043e0a38f30b1ce0 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 8 Apr 2020 10:09:23 +0200
Subject: [PATCH] doc: fix sphinx compatibility

[ upstream commit 10d34aa3dee8daf0a07ae152de8377942f63503b ]

The function add_stylesheet() is deprecated since sphinx 1.8.
It will be removed in sphinx 4.0.
It is replaced by add_css_file().

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 doc/guides/conf.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index 0892c06dec..797ad1ef4b 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -410,4 +410,8 @@ def setup(app):
         # Process the numref references once the doctree has been created.
         app.connect('doctree-resolved', process_numref)
 
-    app.add_stylesheet('css/custom.css')
+    try:
+        # New function in sphinx 1.8
+        app.add_css_file('css/custom.css')
+    except:
+        app.add_stylesheet('css/custom.css')
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:21.582247157 +0100
+++ 0068-doc-fix-sphinx-compatibility.patch	2020-05-19 13:56:18.299503260 +0100
@@ -1,24 +1,24 @@
-From 10d34aa3dee8daf0a07ae152de8377942f63503b Mon Sep 17 00:00:00 2001
+From c4d52beff82ecca2211c99f9043e0a38f30b1ce0 Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Wed, 8 Apr 2020 10:09:23 +0200
 Subject: [PATCH] doc: fix sphinx compatibility
 
+[ upstream commit 10d34aa3dee8daf0a07ae152de8377942f63503b ]
+
 The function add_stylesheet() is deprecated since sphinx 1.8.
 It will be removed in sphinx 4.0.
 It is replaced by add_css_file().
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 ---
  doc/guides/conf.py | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/doc/guides/conf.py b/doc/guides/conf.py
-index c368fa51d4..08dcfcff54 100644
+index 0892c06dec..797ad1ef4b 100644
 --- a/doc/guides/conf.py
 +++ b/doc/guides/conf.py
-@@ -415,4 +415,8 @@ def setup(app):
+@@ -410,4 +410,8 @@ def setup(app):
          # Process the numref references once the doctree has been created.
          app.connect('doctree-resolved', process_numref)