rpms/doxygen
6
0
Fork 0
Code Issues Pull Requests Releases Activity

backpored upstream patch to fix #7248

Browse Source
This commit is contained in:
Than Ngo 2019-09-16 20:57:17 +02:00
parent b8e030a12d
commit 054d45a402
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doxygen-1.8.16-#7248.patch Normal file
View File

@ -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
}
}

8
doxygen.spec
View File

@ -8,7 +8,7 @@ Summary: A documentation system for C/C++
Name: doxygen Name: doxygen
Epoch: 1 Epoch: 1
Version: 1.8.16 Version: 1.8.16
Release: 1%{?dist} Release: 2%{?dist}
# No version is specified. # No version is specified.
License: GPL+ License: GPL+
@ -19,6 +19,7 @@ Source1: doxywizard.png
Source2: doxywizard.desktop Source2: doxywizard.desktop
# upstream patches # upstream patches
Patch0: doxygen-1.8.16-#7248.patch
BuildRequires: %{_bindir}/python3 BuildRequires: %{_bindir}/python3
@ -188,7 +189,10 @@ make tests -C %{_target_platform}
%endif %endif
%changelog %changelog
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 1.8.16-1 * Mon Sep 16 2019 Than Ngo <than@redhat.com> - 1:1.8.16-2
- backpored upstream patch to fix #7248
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 1:1.8.16-1
- resolves #1742614, update to 1.8.16 - resolves #1742614, update to 1.8.16
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-10 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-10