From 16df64000eab426508cde97d15b1d79f39df9f2b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Feb 14 2019 22:15:00 +0000 Subject: fixed bz#1677000, fixed multilib issue --- diff --git a/doxygen-1.8.15-multilib.patch b/doxygen-1.8.15-multilib.patch new file mode 100644 index 0000000..329ce72 --- /dev/null +++ b/doxygen-1.8.15-multilib.patch @@ -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 + { diff --git a/doxygen.spec b/doxygen.spec index dee7630..bdf6716 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.15 -Release: 5%{?dist} +Release: 6%{?dist} # No version is specified. 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 Patch2: doxygen-1.8.15-inconsistent_whitespace_removal_for_operators.patch Patch3: doxygen-1.8.15-crash.patch +Patch4: doxygen-1.8.15-multilib.patch BuildRequires: gcc-c++ gcc BuildRequires: perl-interpreter @@ -187,6 +188,9 @@ make tests -C %{_target_platform} %endif %changelog +* Thu Feb 14 2019 Than Ngo - 1:1.8.15-6 +- fixed bz#1677000, fixed multilib issue + * Tue Feb 12 2019 Than Ngo - 1:1.8.15-5 - fixed bz#1675288, doxygen 1.8.15 segfault