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

bz#688684, apply patch to fix crash when not generating man format

This commit is contained in:
Than Ngo 2011-06-27 11:42:06 +02:00
parent e8c7cd0099
commit ac3c905653
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
doxygen-1.7.3-bz#688684.patch Normal file
View File

@ -0,0 +1,54 @@
--- doxygen-1.7.3.orig/src/memberdef.cpp 2011-01-02 14:17:45.000000000 +0100
+++ doxygen-1.7.3.orig/src/memberdef.cpp 2011-03-23 16:47:58.490450171 +0100
@@ -101,6 +101,7 @@
//ol.disableAllBut(OutputGenerator::Html);
bool htmlOn = ol.isEnabled(OutputGenerator::Html);
bool latexOn = ol.isEnabled(OutputGenerator::Latex);
+ bool manOn = ol.isEnabled(OutputGenerator::Man);
{
// html and latex
if (htmlOn) ol.enable(OutputGenerator::Html);
@@ -108,7 +109,8 @@
ol.endMemberDocName();
ol.startParameterList(!md->isObjCMethod());
}
- ol.enableAll();
+ ol.popGeneratorState();
+ ol.pushGeneratorState();
ol.disable(OutputGenerator::Html);
ol.disable(OutputGenerator::Latex);
{
@@ -210,13 +212,13 @@
ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Latex);
ol.startEmphasis();
- ol.enable(OutputGenerator::Man);
+ if (manOn) ol.enable(OutputGenerator::Man);
if (latexOn) ol.enable(OutputGenerator::Latex);
if (a->name.isEmpty()) ol.docify(a->type); else ol.docify(a->name);
ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Latex);
ol.endEmphasis();
- ol.enable(OutputGenerator::Man);
+ if (manOn) ol.enable(OutputGenerator::Man);
if (latexOn) ol.enable(OutputGenerator::Latex);
}
if (!a->array.isEmpty())
@@ -273,7 +275,6 @@
ol.disable(OutputGenerator::Html);
ol.disable(OutputGenerator::Latex);
if (!md->isObjCMethod()) ol.docify(")"); // end argument list
- ol.enableAll();
if (htmlOn) ol.enable(OutputGenerator::Html);
if (latexOn) ol.enable(OutputGenerator::Latex);
if (first) ol.startParameterName(defArgList->count()<2);
--- doxygen-1.7.3.orig/src/outputgen.cpp 2010-05-09 14:49:09.000000000 +0200
+++ doxygen-1.7.3.orig/src/outputgen.cpp 2011-03-23 15:53:44.768583075 +0100
@@ -58,6 +58,7 @@
void OutputGenerator::endPlainFile()
{
+ t.unsetDevice();
delete file;
file=0;
fileName.resize(0);

7
doxygen.spec
View File

@ -1,12 +1,13 @@
Summary: A documentation system for C/C++
Name: doxygen
Version: 1.7.4
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 1
Url: http://www.stack.nl/~dimitri/doxygen/index.html
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
Patch1: doxygen-1.7.1-config.patch
Patch2: doxygen-1.7.3-timestamp.patch
Patch3: doxygen-1.7.3-bz#688684.patch
Group: Development/Tools
# No version is specified.
@ -45,6 +46,7 @@ are used by doxygen.
%patch1 -p1 -b .config
%patch2 -p1 -b .timestamp
%patch3 -p1 -b .bz#688684
%build
unset QTDIR
@ -97,6 +99,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/doxywizard*
%changelog
* Mon Jun 27 2011 Than Ngo <than@redhat.com> - 1:1.7.4-2
- bz#688684, apply patch to fix crash when not generating man format
* Tue Mar 29 2011 Than Ngo <than@redhat.com> - 1.7.4-1
- 1.7.4