From fb027984ce36cc427219d373d406989893fed58a Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 1 Jan 2025 00:57:21 +0800 Subject: [PATCH] backport fix for regression with HTML_DYNAMIC_MENUS = NO --- ...9-Regression-with-HTML_DYNAMIC_MENUS.patch | 26 +++++++++++++++++++ doxygen.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 backport-issue-11299-Regression-with-HTML_DYNAMIC_MENUS.patch diff --git a/backport-issue-11299-Regression-with-HTML_DYNAMIC_MENUS.patch b/backport-issue-11299-Regression-with-HTML_DYNAMIC_MENUS.patch new file mode 100644 index 0000000..c9ff3bd --- /dev/null +++ b/backport-issue-11299-Regression-with-HTML_DYNAMIC_MENUS.patch @@ -0,0 +1,26 @@ +From f46e21ed722193d74f56b2aa275a5cdc5e40b72b Mon Sep 17 00:00:00 2001 +From: Dimitri van Heesch +Date: Mon, 30 Dec 2024 16:07:04 +0100 +Subject: [PATCH] issue #11299 Regression with HTML_DYNAMIC_MENUS = NO, + DISABLE_INDEX = NO, and custom LAYOUT_FILE + +--- + src/layout.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/layout.h b/src/layout.h +index fc7917291b..247c24eb9c 100644 +--- a/src/layout.h ++++ b/src/layout.h +@@ -232,6 +232,11 @@ struct LayoutNavEntry + std::swap(m_title,other.m_title); + std::swap(m_intro,other.m_intro); + std::swap(m_children,other.m_children); ++ // reparent children ++ for (auto &child : m_children) ++ { ++ child->m_parent = this; ++ } + } + + private: diff --git a/doxygen.spec b/doxygen.spec index b71f60e..642dc9b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -5,13 +5,14 @@ Name: doxygen Epoch: 1 Version: 1.13.0 -Release: 1 +Release: 2 Summary: A documentation system for C/C++ License: GPL-1.0-or-later Url: https://www.doxygen.nl Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz Source1: doxywizard.desktop Source2: doxywizard-icons.tar.xz +Patch6001: backport-issue-11299-Regression-with-HTML_DYNAMIC_MENUS.patch BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter BuildRequires: python3-libxml2 texlive-bibtex sqlite-devel @@ -97,6 +98,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1} %{_datadir}/icons/hicolor/*/apps/doxywizard.png %changelog +* Wed Jan 01 2025 Funda Wang - 1:1.13.0-2 +- backport fix for regression with HTML_DYNAMIC_MENUS = NO + * Sat Dec 28 2024 Funda Wang - 1:1.13.0-1 - update to 1.13.0 - build wizard with qt6, as qt5 was EOLed -- Gitee