From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7E52BA0A02 for ; Mon, 17 May 2021 18:22:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77CF340041; Mon, 17 May 2021 18:22:20 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 58D9040041 for ; Mon, 17 May 2021 18:22:19 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lig0W-0000Yy-Rn; Mon, 17 May 2021 16:22:16 +0000 From: Christian Ehrhardt To: Thomas Monjalon Cc: Bruce Richardson , David Marchand , dpdk stable Date: Mon, 17 May 2021 18:21:25 +0200 Message-Id: <20210517162125.3178901-21-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> References: <20210517162125.3178901-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix build with Sphinx 4' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/99df2c2aa1857b5fc4199dc52be3c636f8d1fc73 Thanks. Christian Ehrhardt --- >From 99df2c2aa1857b5fc4199dc52be3c636f8d1fc73 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 10 May 2021 22:45:37 +0200 Subject: [PATCH] doc: fix build with Sphinx 4 [ upstream commit 86ff0663639417f9d25907d09343a5c231e32a51 ] Sphinx 4.0 became stricter with permalink configuration: " html_add_permalinks has been deprecated since v3.5.0. Please use html_permalinks and html_permalinks_icon instead. " The new variable is used while keeping compatibility with older Sphinx versions. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Reviewed-by: David Marchand --- doc/guides/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/guides/conf.py b/doc/guides/conf.py index be02c2ba20..279b830d7b 100644 --- a/doc/guides/conf.py +++ b/doc/guides/conf.py @@ -33,7 +33,10 @@ except: project = 'Data Plane Development Kit' html_logo = '../logo/DPDK_logo_vertical_rev_small.png' latex_logo = '../logo/DPDK_logo_horizontal_tag.png' -html_add_permalinks = "" +if LooseVersion(sphinx_version) >= LooseVersion('3.5'): + html_permalinks = False +else: + html_add_permalinks = "" html_show_copyright = False highlight_language = 'none' -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:37.580815026 +0200 +++ 0210-doc-fix-build-with-Sphinx-4.patch 2021-05-17 17:40:29.611812942 +0200 @@ -1 +1 @@ -From 86ff0663639417f9d25907d09343a5c231e32a51 Mon Sep 17 00:00:00 2001 +From 99df2c2aa1857b5fc4199dc52be3c636f8d1fc73 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 86ff0663639417f9d25907d09343a5c231e32a51 ] + @@ -15,2 +16,0 @@ -Cc: stable@dpdk.org - @@ -25 +25 @@ -index ec59aeae7e..c22caaa247 100644 +index be02c2ba20..279b830d7b 100644 @@ -28 +28 @@ -@@ -31,7 +31,10 @@ stop_on_error = ('-W' in argv) +@@ -33,7 +33,10 @@ except: