From 2920bf432f5df71a6e1d810affdd161ffc8e0c8f Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 17 2017 16:40:07 +0000 Subject: Add upstream patch to fix regression (rhbz#1413296) --- diff --git a/doxygen-xmlgen-regression.patch b/doxygen-xmlgen-regression.patch new file mode 100644 index 0000000..8d72e8f --- /dev/null +++ b/doxygen-xmlgen-regression.patch @@ -0,0 +1,24 @@ +From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001 +From: albert-github +Date: Wed, 4 Jan 2017 12:24:55 +0100 +Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the + breathe docs + +Protected against NULL pointer of variable al +--- + src/xmlgen.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp +index fe95c7a..70e198a 100644 +--- a/src/xmlgen.cpp ++++ b/src/xmlgen.cpp +@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De + if (md->isInline()) t << "yes"; else t << "no"; + t << "\""; + +- if (al->refQualifier!=RefQualifierNone) ++ if (al!=0 && al->refQualifier!=RefQualifierNone) + { + t << " refqual=\""; + if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue"; diff --git a/doxygen.spec b/doxygen.spec index 807ac04..b71f1c8 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -2,7 +2,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.8.13 -Release: 1%{?dist} +Release: 2%{?dist} # No version is specified. License: GPL+ @@ -12,6 +12,8 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source1: doxywizard.png Source2: doxywizard.desktop +Patch0: https://github.com/doxygen/doxygen/pull/555.patch#/doxygen-xmlgen-regression.patch + BuildRequires: perl BuildRequires: tex(dvips) BuildRequires: tex(latex) @@ -130,6 +132,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} # intentionally left blank %changelog +* Tue Jan 17 2017 Björn Esser - 1:1.8.13-2 +- Add upstream patch to fix regression (rhbz#1413296) + * Thu Dec 29 2016 Orion Poplawski - 1:1.8.13-1 - Update to 1.8.13 - Drop upstream patches