From 84805892b84bbcd6aa2573dd254d4c6a84a96b4f Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 6 Sep 2016 13:32:39 +0200 Subject: [PATCH 1/4] drop doxygen-percent_sign patch which is included in upstream --- doxygen-percent_sign.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 doxygen-percent_sign.patch diff --git a/doxygen-percent_sign.patch b/doxygen-percent_sign.patch deleted file mode 100644 index 417ac48..0000000 --- a/doxygen-percent_sign.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up doxygen-1.8.11/src/util.cpp.than doxygen-1.8.11/src/util.cpp ---- doxygen-1.8.11/src/util.cpp.than 2016-03-06 11:13:21.831912181 +0100 -+++ doxygen-1.8.11/src/util.cpp 2016-03-06 11:15:20.359280738 +0100 -@@ -6732,6 +6732,9 @@ QCString latexEscapePDFString(const char - case '\\': t << "\\textbackslash{}"; break; - case '{': t << "\\{"; break; - case '}': t << "\\}"; break; -+ case '_': t << "\\_"; break; -+ case '%': t << "\\%"; break; -+ case '&': t << "\\&"; break; - default: - t << c; - break; From 51a1d8e5702c85d2034927dec463171185e72377 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 20 Oct 2016 11:57:02 +0200 Subject: [PATCH 2/4] 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++ --- doxygen-771310.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ doxygen-771344.patch | 23 +++++++++++++++++++++++ doxygen.spec | 11 +++++++++-- 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 doxygen-771310.patch create mode 100644 doxygen-771344.patch 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 From 3189626ce03a0939c96923798c4df6dfc145ffe1 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 15 Nov 2016 11:39:54 +0100 Subject: [PATCH 3/4] - bz#1394456, add missing docs - fix build issue when build_doc=ON --- doxygen.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/doxygen.spec b/doxygen.spec index 6c9191e..7aa4682 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: 2%{?dist} +Release: 3%{?dist} # No version is specified. License: GPL+ @@ -23,6 +23,8 @@ BuildRequires: tex(multirow.sty) BuildRequires: tex(sectsty.sty) BuildRequires: tex(tocloft.sty) BuildRequires: tex(xtab.sty) +BuildRequires: tex(import.sty) +BuildRequires: tex(tabu.sty) BuildRequires: /usr/bin/epstopdf BuildRequires: texlive-epstopdf BuildRequires: ghostscript @@ -78,7 +80,7 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO mkdir -p %{_target_platform} pushd %{_target_platform} %cmake \ - -Dbuild_doc=OFF \ + -Dbuild_doc=ON \ -Dbuild_wizard=ON \ -Dbuild_xmlparser=ON \ -Dbuild_search=ON \ @@ -88,12 +90,11 @@ pushd %{_target_platform} .. popd +make docs %{?_smp_mflags} -C %{_target_platform} make %{?_smp_mflags} -C %{_target_platform} %install -make install \ - DESTDIR=%{buildroot} \ - -C %{_target_platform} +make install DESTDIR=%{buildroot} -C %{_target_platform} install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png @@ -101,11 +102,15 @@ install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png mkdir -p %{buildroot}/%{_mandir}/man1 cp doc/*.1 %{buildroot}/%{_mandir}/man1/ -desktop-file-install \ - --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} +# remove duplicate +rm -rf %{buildroot}/%{_docdir}/packages + +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %files %doc LANGUAGE.HOWTO README.md +%doc %{_target_platform}/latex/doxygen_manual.pdf +%doc %{_target_platform}/html %{_bindir}/doxygen %{_bindir}/doxyindexer %{_bindir}/doxysearch* @@ -122,8 +127,11 @@ desktop-file-install \ %files latex # intentionally left blank - %changelog +* Tue Nov 15 2016 Than Ngo - 1:1.8.12-3 +- bz#1394456, add missing docs +- fix build issue when build_doc=ON + * 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 From 60e3e105cb0ee397db0cb361b68b752c63cee34c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 15 Nov 2016 12:52:04 +0100 Subject: [PATCH 4/4] add BR on appendix.sty --- doxygen.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/doxygen.spec b/doxygen.spec index 7aa4682..034b05d 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -25,6 +25,7 @@ BuildRequires: tex(tocloft.sty) BuildRequires: tex(xtab.sty) BuildRequires: tex(import.sty) BuildRequires: tex(tabu.sty) +BuildRequires: tex(appendix.sty) BuildRequires: /usr/bin/epstopdf BuildRequires: texlive-epstopdf BuildRequires: ghostscript