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

fixed bz#1677000, fixed multilib issue

Browse Source
This commit is contained in:
Than Ngo 2019-02-14 23:15:00 +01:00
parent 32e3f8ab66
commit 16df64000e
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doxygen-1.8.15-multilib.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up doxygen-1.8.15/src/dirdef.cpp.me doxygen-1.8.15/src/dirdef.cpp
--- doxygen-1.8.15/src/dirdef.cpp.me 2019-02-14 22:57:29.709491363 +0100
+++ doxygen-1.8.15/src/dirdef.cpp 2019-02-14 22:59:10.922169840 +0100
@@ -936,14 +936,14 @@ void buildDirectories()
for (;(fd=fni.current());++fni)
{
//printf("buildDirectories %s\n",fd->name().data());
- if (fd->getReference().isEmpty())
+ if (fd->getReference().isEmpty() && !fd->isDocumentationFile())
{
DirDef *dir;
if ((dir=Doxygen::directories->find(fd->getPath()))==0) // new directory
{
dir = DirDef::mergeDirectoryInTree(fd->getPath());
}
- if (dir && !fd->isDocumentationFile()) dir->addFile(fd);
+ if (dir) dir->addFile(fd);
}
else
{

6
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.15 Version: 1.8.15
Release: 5%{?dist} Release: 6%{?dist}
# No version is specified. # No version is specified.
License: GPL+ License: GPL+
@ -23,6 +23,7 @@ Patch0: doxygen-1.8.15-handle_empty_TOC_in_XML_output.patch
Patch1: doxygen-1.8.15-test_for_XML_output_with_an_empty_TOC.patch Patch1: doxygen-1.8.15-test_for_XML_output_with_an_empty_TOC.patch
Patch2: doxygen-1.8.15-inconsistent_whitespace_removal_for_operators.patch Patch2: doxygen-1.8.15-inconsistent_whitespace_removal_for_operators.patch
Patch3: doxygen-1.8.15-crash.patch Patch3: doxygen-1.8.15-crash.patch
Patch4: doxygen-1.8.15-multilib.patch
BuildRequires: gcc-c++ gcc BuildRequires: gcc-c++ gcc
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
@ -187,6 +188,9 @@ make tests -C %{_target_platform}
%endif %endif
%changelog %changelog
* Thu Feb 14 2019 Than Ngo <than@redhat.com> - 1:1.8.15-6
- fixed bz#1677000, fixed multilib issue
* Tue Feb 12 2019 Than Ngo <than@redhat.com> - 1:1.8.15-5 * Tue Feb 12 2019 Than Ngo <than@redhat.com> - 1:1.8.15-5
- fixed bz#1675288, doxygen 1.8.15 segfault - fixed bz#1675288, doxygen 1.8.15 segfault