From 51a1d8e5702c85d2034927dec463171185e72377 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Oct 20 2016 09:57:02 +0000 Subject: backport upstream fixes: Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error Bug 771344 - Class name 'internal' breaks class hierarchy in C++ --- diff --git a/doxygen-771310.patch b/doxygen-771310.patch new file mode 100644 index 0000000..43385d2 --- /dev/null +++ b/doxygen-771310.patch @@ -0,0 +1,43 @@ +commit b5e1e195bc207c7bb93df4e51253f9f3a1026a3d +Author: Dimitri van Heesch +Date: Wed Sep 21 20:24:15 2016 +0200 + + Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error + +diff --git a/src/index.cpp b/src/index.cpp +index 96909c7..41e3318 100644 +--- a/src/index.cpp ++++ b/src/index.cpp +@@ -4327,8 +4327,8 @@ void renderMemberIndicesAsJs(FTextStream &t, + t << "children:["; + firstMember=FALSE; + } +- t << endl << "{text:'" << convertToJSString(getInfo(i)->title) << "',url:'" +- << convertToJSString(getInfo(i)->fname+Doxygen::htmlFileExtension) << "'"; ++ t << endl << "{text:\"" << convertToJSString(getInfo(i)->title) << "\",url:\"" ++ << convertToJSString(getInfo(i)->fname+Doxygen::htmlFileExtension) << "\""; + + // Check if we have many members, then add sub entries per letter... + // quick alphabetical index +@@ -4357,8 +4357,8 @@ void renderMemberIndicesAsJs(FTextStream &t, + anchor=fullName+extension+"#index_"; + else // other pages of multi page index + anchor=fullName+"_"+is+extension+"#index_"; +- t << "{text:'" << convertToJSString(ci) << "',url:'" +- << convertToJSString(anchor+is) << "'}"; ++ t << "{text:\"" << convertToJSString(ci) << "\",url:\"" ++ << convertToJSString(anchor+is) << "\"}"; + firstLetter=FALSE; + } + t << "]"; +@@ -4393,8 +4393,8 @@ static bool renderQuickLinksAsJs(FTextStream &t,LayoutNavEntry *root,bool first) + if (!firstChild) t << "," << endl; + firstChild=FALSE; + QCString url = entry->url(); +- t << "{text:'" << convertToJSString(entry->title()) << "',url:'" +- << convertToJSString(url) << "'"; ++ t << "{text:\"" << convertToJSString(entry->title()) << "\",url:\"" ++ << convertToJSString(url) << "\""; + bool hasChildren=FALSE; + if (entry->kind()==LayoutNavEntry::NamespaceMembers) + { diff --git a/doxygen-771344.patch b/doxygen-771344.patch new file mode 100644 index 0000000..c8263eb --- /dev/null +++ b/doxygen-771344.patch @@ -0,0 +1,23 @@ +commit b93dbcdab6dfc5681ec49f1d567698b7c4dc6846 +Author: albert-github +Date: Sun Sep 18 17:58:30 2016 +0200 + + Bug 771344 - Class name 'internal' breaks class hierarchy in C++ + + Analogous to the rule for: + {B}*"internal"{BN}*":"{BN}* + reject the "internal" keyword in case not in Cli + +diff --git a/src/scanner.l b/src/scanner.l +index 6c69224..68eb8fc 100644 +--- a/src/scanner.l ++++ b/src/scanner.l +@@ -5771,7 +5771,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) + "virtual"{BN}+ { lineCount(); baseVirt = Virtual; } + "public"{BN}+ { lineCount(); baseProt = Public; } + "protected"{BN}+ { lineCount(); baseProt = Protected; } +-"internal"{BN}+ { lineCount(); baseProt = Package; } ++"internal"{BN}+ { if (!insideCli) REJECT ; lineCount(); baseProt = Package; } + "private"{BN}+ { lineCount(); baseProt = Private; } + {BN} { lineCount(); } + . { unput(*yytext); BEGIN(Bases); } diff --git a/doxygen.spec b/doxygen.spec index 179df67..6c9191e 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.12 -Release: 1%{?dist} +Release: 2%{?dist} # No version is specified. License: GPL+ @@ -13,6 +13,8 @@ Source1: doxywizard.png Source2: doxywizard.desktop # upstream fixes +Patch1: doxygen-771310.patch +Patch2: doxygen-771344.patch BuildRequires: perl BuildRequires: tex(dvips) @@ -63,7 +65,7 @@ Requires: texlive-epstopdf-bin %prep -%setup -q +%autosetup -p1 # convert into utf-8 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new @@ -122,6 +124,11 @@ desktop-file-install \ %changelog +* Thu Oct 20 2016 Than Ngo - 1:1.8.12-2 +- backport upstream fixes + Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error + Bug 771344 - Class name 'internal' breaks class hierarchy in C++ + * Tue Sep 06 2016 Than Ngo - 1:1.8.12-1 - 1.8.12 - fixed bz#1373167 - doxygen ships bogus man pages