From patchwork Fri Jul 28 19:39:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 18903 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 86929BDB13 for ; Fri, 28 Jul 2023 19:39:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DFC91627E7; Fri, 28 Jul 2023 21:39:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1690573193; bh=JkFiyTTYynOLdBqE7vtfhE7oB3xy9yuW8qP1nK4yzSU=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Ok+8D/Jgz8w24zy+hejViKqPTKBZIXS7GxkgtEEH7YxyuqYkvB2ax2weFypiIR3qy RAW03hs2r3i1CCiq1mV4gGO25bNnfUZyg4EU4mrYmJOLJbM8sR/Tc2a8wSaoDuYuND m+KgTKxpVqFzALdeNUBXB73yF1WbKFgi0C0pZjqC7wNuHl9a+do8Os7QX0DJwvV3WQ ZiBK2z+6Etk58KAjR8KTw5wCsKUa/mA22/gy/DiHIv4wJkt5JSCSrwgX6RzmoQ4tCq 1dprl247dxwWQsluSAw4slivEEAbs1C7y7H1idsEIcpAFu367C5Bipkk0Fuq4k6AnN WhgmfD3KBxNwA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 60D1E627E6 for ; Fri, 28 Jul 2023 21:39:52 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="OY7NHS4o"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9FC4E2B3 for ; Fri, 28 Jul 2023 21:38:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1690573131; bh=JkFiyTTYynOLdBqE7vtfhE7oB3xy9yuW8qP1nK4yzSU=; h=From:To:Subject:Date:From; b=OY7NHS4oiihILyEc6fGAdi6eVq4Ef318+DOs7k4DrG6hOL+3qXQVROLkEkW3YGwd1 d6DubPYOYsXWy/exD9rhlUDBKBzcSb7OxVuFGkkz24GsBqRsPhYIWzZwqhjdgiCk8p MsC+ljZJ+7bEaWxOIwkzej3rtREHET7FG873bpxQ= To: libcamera-devel@lists.libcamera.org Date: Fri, 28 Jul 2023 22:39:57 +0300 Message-ID: <20230728193957.19723-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] Documentation: theme: Fix compilation with Sphinx >= 7.0.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Sphinx 7.0.0 has dropped support for the deprecated 'style' variable (https://github.com/sphinx-doc/sphinx/pull/11381). This breaks compilation of the documentation: /usr/bin/sphinx-build -D release=v0.1.0+16-eed6a079 -q -W -b html Documentation Documentation/html Theme error: An error happened in rendering the page api-html/index. Reason: UndefinedError("'style' is undefined") The recommended replacement is 'styles[-1]'. However, this resolves to '_static/css/theme.css', which is part of the 'css_styles' variable, and results in the stylesheet being included twice. To avoid that and fix the compilation error, simply drop the first reference. Signed-off-by: Laurent Pinchart Tested-by: Kieran Bingham Reviewed-by: Kieran Bingham --- I've tested this change with Sphinx 7.0.1. If anyone can test with earlier versions of Sphinx, that would be appreciated. Please verify in the index.html that _static/css/theme.css is correctly referenced. --- Documentation/theme/layout.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Documentation/theme/layout.html b/Documentation/theme/layout.html index fcc6d221870c..4fffefab62eb 100644 --- a/Documentation/theme/layout.html +++ b/Documentation/theme/layout.html @@ -33,11 +33,6 @@ SPDX-License-Identifier: CC-BY-SA-4.0 {% endif %} - {# RTD hosts this file, so just load on non RTD builds #} - {% if not READTHEDOCS %} - - {% endif %} - {% for cssfile in css_files %} {% endfor %}