Adding upstream version 7.3.7.upstream/7.3.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 21 insertions, 19 deletions

diff --git a/sphinx/themes/haiku/layout.html b/sphinx/themes/haiku/layout.html
index 4e14826..c0c1904 100644
--- a/sphinx/themes/haiku/layout.html
+++ b/sphinx/themes/haiku/layout.html
@@ -4,7 +4,7 @@
 
     Sphinx layout template for the haiku theme.
 
-    :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 #}
 {%- extends "basic/layout.html" %}
@@ -35,14 +35,14 @@
       <div class="header" role="banner">
         {%- block haikuheader %}
         {%- if theme_full_logo != "false" %}
-        <a href="{{ pathto('index') }}">
+        <a href="{{ pathto(root_doc)|e }}">
           <img class="logo" src="{{ logo_url|e }}" alt="Logo"/>
         </a>
         {%- else %}
         {%- if logo -%}
           <img class="rightlogo" src="{{ logo_url|e }}" alt="Logo"/>
         {%- endif -%}
-        <h1 class="heading"><a href="{{ pathto('index') }}">
+        <h1 class="heading"><a href="{{ pathto(root_doc)|e }}">
           <span>{{ shorttitle|e }}</span></a></h1>
         <h2 class="heading"><span>{{ title|striptags|e }}</span></h2>
         {%- endif %}
diff --git a/sphinx/themes/haiku/static/haiku.css_t b/sphinx/themes/haiku/static/haiku.css_t
index bccc3ea..ce449b5 100644
--- a/sphinx/themes/haiku/static/haiku.css_t
+++ b/sphinx/themes/haiku/static/haiku.css_t
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- haiku theme.
  *
- * Adapted from http://haiku-os.org/docs/Haiku-doc.css.
+ * Adapted from https://haiku-os.org/docs/Haiku-doc.css.
  * Original copyright message:
  *
  *     Copyright 2008-2009, Haiku. All rights reserved.
@@ -16,7 +16,7 @@
  *              Braden Ewing <brewin@gmail.com>
  *              Humdinger <humdingerb@gmail.com>
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
diff --git a/sphinx/themes/haiku/theme.conf b/sphinx/themes/haiku/theme.conf
deleted file mode 100644
index 77dd7c7..0000000
--- a/sphinx/themes/haiku/theme.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = haiku.css
-pygments_style = autumn
-
-[options]
-full_logo         = false
-body_min_width    = 59em
-body_max_width    = 70em
-textcolor         = #333333
-headingcolor      = #0c3762
-linkcolor         = #dc3c01
-visitedlinkcolor  = #551a8b
-hoverlinkcolor    = #ff4500
diff --git a/sphinx/themes/haiku/theme.toml b/sphinx/themes/haiku/theme.toml
new file mode 100644
index 0000000..149b89d
--- /dev/null
+++ b/sphinx/themes/haiku/theme.toml
@@ -0,0 +1,16 @@
+[theme]
+inherit = "basic"
+stylesheets = [
+    "haiku.css",
+]
+pygments_style = { default = "autumn" }
+
+[options]
+full_logo        = "false"
+body_min_width   = "59em"
+body_max_width   = "70em"
+textcolor        = "#333333"
+headingcolor     = "#0c3762"
+linkcolor        = "#dc3c01"
+visitedlinkcolor = "#551a8b"
+hoverlinkcolor   = "#ff4500"