rpms/doxygen
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert upstream patch causing segfault seen on arm [release 1.8.14-2mamba;Mon Aug 27 2018]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 21:55:52 +01:00
parent 575be1cb84
commit 2256a67f5e
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
doxygen-1.8.14-upstream-bug-789168-segfault.patch Normal file
View File

@ -0,0 +1,51 @@
From 9468ede259153cf79eb8d61635389744e9a2ee7d Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Sun, 29 Oct 2017 11:47:48 +0100
Subject: [PATCH] Bug 789168 - Increasing access of inherited C++ members with
'using...' is not recognized by Doxygen
---
src/doxygen.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d3554cffd..ec97d4354 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -2112,9 +2112,8 @@ static void findUsingDeclImports(EntryNav *rootNav)
(rootNav->parent()->section()&Entry::COMPOUND_MASK) // in a class/struct member
)
{
- //printf("Found using declaration %s at line %d of %s inside section %x\n",
- // root->name.data(),root->startLine,root->fileName.data(),
- // root->parent->section);
+ //printf("Found using declaration %s inside section %x\n",
+ // rootNav->name().data(), rootNav->parent()->section());
QCString fullName=removeRedundantWhiteSpace(rootNav->parent()->name());
fullName=stripAnonymousNamespaceScope(fullName);
fullName=stripTemplateSpecifiersFromScope(fullName);
@@ -2130,7 +2129,7 @@ static void findUsingDeclImports(EntryNav *rootNav)
ClassDef *bcd = getResolvedClass(cd,0,scope); // todo: file in fileScope parameter
if (bcd)
{
- //printf("found class %s\n",bcd->name().data());
+ //printf("found class %s memName=%s\n",bcd->name().data(),memName.data());
MemberNameInfoSDict *mndict=bcd->memberNameInfoSDict();
if (mndict)
{
@@ -11181,7 +11180,6 @@ void parseInput()
g_s.end();
g_s.begin("Searching for members imported via using declarations...\n");
- findUsingDeclImports(rootNav);
// this should be after buildTypedefList in order to properly import
// used typedefs
findUsingDeclarations(rootNav);
@@ -11249,6 +11247,7 @@ void parseInput()
g_s.begin("Searching for member function documentation...\n");
findObjCMethodDefinitions(rootNav);
findMemberDocumentation(rootNav); // may introduce new members !
+ findUsingDeclImports(rootNav); // may introduce new members !
transferRelatedFunctionDocumentation();
transferFunctionDocumentation();

7
doxygen.spec
View File

@ -8,7 +8,7 @@
Name: doxygen
Version: 1.8.14
Release: 1mamba
Release: 2mamba
Summary: A documentation system for C, C++, Java, IDL, Objective-C, PHP, C# and D
Group: Applications/Development
Vendor: openmamba
@ -20,6 +20,7 @@ Patch1: doxygen-1.7.1-config.patch
Patch2: doxygen-1.6.2-timestamp.patch
Patch3: doxygen-1.7.2-fix_cftchapfont.patch
Patch4: doxygen-1.8.10-flex-2.6.patch
Patch5: doxygen-1.8.14-upstream-bug-789168-segfault.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -72,6 +73,7 @@ This package contains the documentation in HTML format and PDF format.
%prep
%setup -q
#%patch4 -p1
%patch5 -R -p1
%build
%if %{with_qt_wiz}
@ -153,6 +155,9 @@ find examples -type f | xargs chmod -x
%doc LANGUAGE.HOWTO examples
%changelog
* Mon Aug 27 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.14-2mamba
- revert upstream patch causing segfault seen on arm
* Mon Aug 13 2018 Automatic Build System <autodist@mambasoft.it> 1.8.14-1mamba
- automatic version update by autodist