forked from pool/doxygen
Accepting request 762564 from home:cgiboudeaux:branches:devel:tools
- Add upstream patch 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch (boo#1160629) OBS-URL: https://build.opensuse.org/request/show/762564 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=143
This commit is contained in:
Git OBS Bridge
parent
fb4d4356c6
commit
cbc445d421
@ -0,0 +1,51 @@
|
||||
From 316902302c6af1ec43f9d1ad4d57d30a9a9fadf7 Mon Sep 17 00:00:00 2001
|
||||
From: albert-github <albert.tests@gmail.com>
|
||||
Date: Mon, 9 Sep 2019 13:28:28 +0200
|
||||
Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
|
||||
broken index.qhp
|
||||
|
||||
Ignore automatically generated anchor names when importing a tag file.
|
||||
---
|
||||
src/tagreader.cpp | 19 ++++++++++++++++++-
|
||||
1 file changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
|
||||
index 56dbe7d..d79d9b5 100644
|
||||
--- a/src/tagreader.cpp
|
||||
+++ b/src/tagreader.cpp
|
||||
@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
|
||||
|
||||
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 QXmlDefaultHandler
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 9 21:13:50 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Add upstream patch 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch
|
||||
(boo#1160629)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 7 21:07:47 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package doxygen
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,7 +26,7 @@ Summary: Automated C, C++, and Java Documentation Generator
|
||||
# qtools are used for building and they are GPL-3.0 licensed
|
||||
License: GPL-2.0-or-later AND GPL-3.0-only
|
||||
Group: Development/Tools/Doc Generators
|
||||
Url: http://www.doxygen.nl/
|
||||
URL: http://www.doxygen.nl/
|
||||
Source0: http://doxygen.nl/files/doxygen-%{version}.src.tar.gz
|
||||
# suse specific
|
||||
Patch0: %{name}-modify_footer.patch
|
||||
@ -39,6 +39,8 @@ Patch5: doxygen-git-not-required.patch
|
||||
Patch6: doxygen-llvm-libs.patch
|
||||
# PATCH-FIX-UPSTREAM: Populate FILE_PATTERN default if not set (issue#7190)
|
||||
Patch7: PR_7193_fix_blank_file_patterns.patch
|
||||
# PATCH-FIX-UPSTREAM Including external tag files with TOC produces a broken index.qhp
|
||||
Patch8: 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake >= 2.8.12
|
||||
BuildRequires: flex
|
||||
@ -70,6 +72,7 @@ as well.
|
||||
%patch6
|
||||
%endif
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package doxywizard
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ Summary: Graphical User Interface for Doxygen
|
||||
# qtools are used for building and they are GPL-3.0 licensed
|
||||
License: GPL-2.0-or-later AND GPL-3.0-only
|
||||
Group: Development/Tools/Doc Generators
|
||||
Url: http://www.doxygen.nl/
|
||||
URL: http://www.doxygen.nl/
|
||||
Source: http://doxygen.nl/files/doxygen-%{version}.src.tar.gz
|
||||
Source1: doxywizard.desktop
|
||||
# PATCH-FIX-UPSTREAM: add missing returns to non-void functions
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user