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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2f5fe24636a8cab5034ec80bc34e00676bcd30f7

Thanks.

Kevin.

---
>From 2f5fe24636a8cab5034ec80bc34e00676bcd30f7 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 2ebbf50c60..91b2f1153e 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -415,3 +415,7 @@ def setup(app):
         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.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:00.768805638 +0100
+++ 0031-doc-fix-sphinx-compatibility.patch	2020-05-28 17:12:59.091556627 +0100
@@ -1 +1 @@
-From 10d34aa3dee8daf0a07ae152de8377942f63503b Mon Sep 17 00:00:00 2001
+From 2f5fe24636a8cab5034ec80bc34e00676bcd30f7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 10d34aa3dee8daf0a07ae152de8377942f63503b ]
+
@@ -10,2 +11,0 @@
-Cc: stable at dpdk.org
-
@@ -18 +18 @@
-index c368fa51d4..08dcfcff54 100644
+index 2ebbf50c60..91b2f1153e 100644
@@ -21 +21 @@
-@@ -416,3 +416,7 @@ def setup(app):
+@@ -415,3 +415,7 @@ def setup(app):