From 054d45a4022cce25084bc810147daa8f97768ecf Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sep 16 2019 18:57:17 +0000 Subject: backpored upstream patch to fix #7248 --- diff --git a/doxygen-1.8.16-#7248.patch b/doxygen-1.8.16-#7248.patch new file mode 100644 index 0000000..6a79b65 --- /dev/null +++ b/doxygen-1.8.16-#7248.patch @@ -0,0 +1,36 @@ +diff -up doxygen-1.8.16/src/tagreader.cpp.me doxygen-1.8.16/src/tagreader.cpp +--- doxygen-1.8.16/src/tagreader.cpp.me 2019-09-16 20:47:16.428896400 +0200 ++++ doxygen-1.8.16/src/tagreader.cpp 2019-09-16 20:48:53.426648016 +0200 +@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefault + + void endDocAnchor() + { ++ // Check whether or not the tag is automatically generate, in that case ignore the tag. ++ switch(m_state) ++ { ++ case InClass: ++ case InFile: ++ case InNamespace: ++ case InGroup: ++ case InPage: ++ case InMember: ++ case InPackage: ++ case InDir: ++ if (QString(m_curString).startsWith("autotoc_md")) return; ++ break; ++ default: ++ warn("Unexpected tag 'docanchor' found"); ++ return; ++ } + switch(m_state) + { + case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; +@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefault + case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; + case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; + case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; +- default: warn("Unexpected tag 'docanchor' found"); break; ++ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore + } + } + diff --git a/doxygen.spec b/doxygen.spec index d33ad46..5498712 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -8,7 +8,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.8.16 -Release: 1%{?dist} +Release: 2%{?dist} # No version is specified. License: GPL+ @@ -19,6 +19,7 @@ Source1: doxywizard.png Source2: doxywizard.desktop # upstream patches +Patch0: doxygen-1.8.16-#7248.patch BuildRequires: %{_bindir}/python3 @@ -188,7 +189,10 @@ make tests -C %{_target_platform} %endif %changelog -* Wed Sep 11 2019 Than Ngo - 1.8.16-1 +* Mon Sep 16 2019 Than Ngo - 1:1.8.16-2 +- backpored upstream patch to fix #7248 + +* Wed Sep 11 2019 Than Ngo - 1:1.8.16-1 - resolves #1742614, update to 1.8.16 * Wed Jul 24 2019 Fedora Release Engineering - 1:1.8.15-10