7 changed files with 220 additions and 494 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,16 +46,3 @@ doxygen-1.7.1.src.tar.gz
 /doxygen-1.8.11.src.tar.gz
 /doxygen-1.8.12.src.tar.gz
 /doxygen-1.8.13.src.tar.gz
-/doxygen-1.8.14.src.tar.gz
-/doxygen-1.8.15.src.tar.gz
-/doxygen-1.8.16.src.tar.gz
-/doxygen-1.8.17.src.tar.gz
-/doxygen-1.8.18.src.tar.gz
-/doxywizard-icons.tar.xz
-/doxygen-1.9.1.src.tar.gz
-/doxygen-1.9.2.src.tar.gz
-/doxygen-1.9.2-d882240f-git.src.tar.gz
-/doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz
-/doxygen-1.9.4.src.tar.gz
-/doxygen-1.9.5.src.tar.gz
-/doxygen-1.9.6.src.tar.gz
--- a/doxygen-1.8.13-#775493.patch
+++ b/doxygen-1.8.13-#775493.patch
@ -0,0 +1,93 @@
+diff --git a/src/commentscan.l b/src/commentscan.l
+index fad09d9..f26cabd 100644
+--- a/src/commentscan.l
+++ b/src/commentscan.l
+@@ -125,6 +125,8 @@ static bool handleCopyBrief(const QCString &);
+ static bool handleCopyDetails(const QCString &);
+ static bool handleParBlock(const QCString &);
+ static bool handleEndParBlock(const QCString &);
+static bool handleParam(const QCString &);
+static bool handleRetval(const QCString &);
+ 
+ typedef bool (*DocCmdFunc)(const QCString &name);
+ 
+@@ -247,7 +249,7 @@ static DocCmdMap docCmdMap[] =
+   { "line",            0,                       TRUE  },
+   { "note",            0,                       TRUE  },
+   { "par",             0,                       TRUE  },
+-  { "param",           0,                       TRUE  },
+  { "param",           &handleParam,            TRUE  },
+   { "tparam",          0,                       TRUE  },
+   { "post",            0,                       TRUE  },
+   { "pre",             0,                       TRUE  },
+@@ -257,7 +259,7 @@ static DocCmdMap docCmdMap[] =
+   { "return",          0,                       TRUE  },
+   { "returns",         0,                       TRUE  },
+   { "exception",       0,                       TRUE  },
+-  { "retval",          0,                       TRUE  },
+  { "retval",          &handleRetval,           TRUE  },
+   { "sa",              0,                       TRUE  },
+   { "see",             0,                       TRUE  },
+   { "since",           0,                       TRUE  },
+@@ -971,6 +973,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
+ %x      XRefItemParam2
+ %x      XRefItemParam3
+ %x      FileDocArg1
+%x      ParamArg1
+ %x	EnumDocArg1
+ %x	NameSpaceDocArg1
+ %x	PackageDocArg1
+@@ -1564,6 +1567,30 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
+ 					  BEGIN( Comment );
+ 					}
+ 
+  /* --------- handle arguments of the param command ------------ */
+<ParamArg1>{ID}/{B}*","                 {
+                                          if (yytext[0]=='_' && Config_getBool(MARKDOWN_SUPPORT))
+                                          {
+                                            addOutput('\\');
+                                          }
+                                          addOutput(yytext);
+                                        }
+<ParamArg1>","                          {
+                                          addOutput(" , ");
+                                        }
+<ParamArg1>{ID}                         {
+                                          if (yytext[0]=='_' && Config_getBool(MARKDOWN_SUPPORT))
+                                          {
+                                            addOutput('\\');
+                                          }
+                                          addOutput(yytext);
+                                          BEGIN( Comment );
+                                        }
+<ParamArg1>.                            {
+                                          unput(yytext[0]);
+                                          BEGIN( Comment );
+                                        }
+
+   /* --------- handle arguments of the file/dir/example command ------------ */
+ 
+ <FileDocArg1>{DOCNL}			{ // no file name specfied
+@@ -2400,6 +2427,22 @@ static bool handleFile(const QCString &)
+   return stop;
+ }
+ 
+static bool handleParam(const QCString &)
+{
+  // we need process param and retval arguments to escape leading underscores in case of
+  // markdown processing, see bug775493
+  addOutput("@param ");
+  BEGIN( ParamArg1 );
+  return FALSE;
+}
+
+static bool handleRetval(const QCString &)
+{
+  addOutput("@retval ");
+  BEGIN( ParamArg1 );
+  return FALSE;
+}
+
+ static bool handleDir(const QCString &)
+ {
+   bool stop=makeStructuralIndicator(Entry::DIRDOC_SEC);
--- a/doxygen-1.8.13-#776988.patch
+++ b/doxygen-1.8.13-#776988.patch
@ -0,0 +1,38 @@
+diff --git a/src/doctokenizer.l b/src/doctokenizer.l
+index a89570e..7545cba 100644
+--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
+@@ -395,10 +395,14 @@ HTMLTAG   "<"(("/")?){ID}({WS}+{ATTRIB})*{WS}*(("/")?)">"
+ HTMLKEYL  "strong"|"center"|"table"|"caption"|"small"|"code"|"dfn"|"var"|"img"|"pre"|"sub"|"sup"|"tr"|"td"|"th"|"ol"|"ul"|"li"|"tt"|"kbd"|"em"|"hr"|"dl"|"dt"|"dd"|"br"|"i"|"a"|"b"|"p"
+ HTMLKEYU  "STRONG"|"CENTER"|"TABLE"|"CAPTION"|"SMALL"|"CODE"|"DFN"|"VAR"|"IMG"|"PRE"|"SUB"|"SUP"|"TR"|"TD"|"TH"|"OL"|"UL"|"LI"|"TT"|"KBD"|"EM"|"HR"|"DL"|"DT"|"DD"|"BR"|"I"|"A"|"B"|"P"
+ HTMLKEYW  {HTMLKEYL}|{HTMLKEYU}
+-REFWORD2  ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?){FUNCARG2}?
+-REFWORD3  ({ID}":")*{ID}":"?
+-REFWORD4  (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2})){CVSPEC}?
+-REFWORD   {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
+REFWORD2_PRE   ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?)
+REFWORD2       {REFWORD2_PRE}{FUNCARG2}?
+REFWORD2_NOCV  {REFWORD2_PRE}("("{FUNCPART}")")?
+REFWORD3       ({ID}":")*{ID}":"?
+REFWORD4_NOCV  (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2}))
+REFWORD4       {REFWORD4_NOCV}{CVSPEC}?
+REFWORD        {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
+REFWORD_NOCV   {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
+ 
+ %option noyywrap
+ %option yylineno
+@@ -1011,6 +1015,14 @@ REFWORD   {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
+                          unput(*yytext);
+   			 return 0;
+   		       }
+<St_Ref>{REFWORD_NOCV}/{BLANK}("const")[a-z_A-Z0-9] { // see bug776988
+  			 g_token->name=yytext;
+			 return TK_WORD;
+                       }
+<St_Ref>{REFWORD_NOCV}/{BLANK}("volatile")[a-z_A-Z0-9] { // see bug776988
+  			 g_token->name=yytext;
+			 return TK_WORD;
+                       }
+ <St_Ref>{REFWORD}      { // label to refer to
+   			 g_token->name=yytext;
+ 			 return TK_WORD;
--- a/doxygen-obsolete-egrep.patch
+++ b/doxygen-obsolete-egrep.patch
@ -1,40 +0,0 @@
--- doxygen-1.9.6.orig/templates/latex/latexmakefile.tpl	2023-03-09 10:29:08.772377871 +0100
-+++ doxygen-1.9.6/templates/latex/latexmakefile.tpl	2023-03-09 10:29:23.754555476 +0100
-@@ -9,7 +9,7 @@
- {# TODO: generateBib #}
- 	pdflatex refman
- 	latex_count=8 ; \
-	while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
-+	while grep -E -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
- 	    do \
- 	      echo "Rerunning latex...." ;\
- 	      pdflatex refman ;\
-@@ -43,7 +43,7 @@
- 	echo "Rerunning latex...."
- 	{{ config.LATEX_CMD_NAME }} refman.tex
- 	latex_count=8 ; \
-	while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
-+	while grep -E -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
- 	    do \
- 	      echo "Rerunning latex...." ;\
- 	      {{ config.LATEX_CMD_NAME }} refman.tex ;\
--- doxygen-1.9.6.orig/src/latexgen.cpp	2023-03-09 11:10:52.092688592 +0100
-+++ doxygen-1.9.6/src/latexgen.cpp	2023-03-09 11:11:07.666867516 +0100
-@@ -346,7 +346,7 @@
-     t << "\techo \"Rerunning latex....\"\n"
-       << "\t$(LATEX_CMD) $(MANUAL_FILE).tex\n"
-       << "\tlatex_count=$(LATEX_COUNT) ; \\\n"
-      << "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
-+      << "\twhile grep -E -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
-       << "\t    do \\\n"
-       << "\t      echo \"Rerunning latex....\" ;\\\n"
-       << "\t      $(LATEX_CMD) $(MANUAL_FILE).tex ; \\\n"
-@@ -374,7 +374,7 @@
-     }
-     t << "\t$(LATEX_CMD) $(MANUAL_FILE)\n"
-       << "\tlatex_count=$(LATEX_COUNT) ; \\\n"
-      << "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
-+      << "\twhile grep -E -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
-       << "\t    do \\\n"
-       << "\t      echo \"Rerunning latex....\" ;\\\n"
-       << "\t      $(LATEX_CMD) $(MANUAL_FILE) ;\\\n"
--- a/doxygen-xmlgen-regression.patch
+++ b/doxygen-xmlgen-regression.patch
@ -0,0 +1,24 @@
+From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+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";
--- a/doxygen.spec
+++ b/doxygen.spec
@ -1,132 +1,53 @@
-%if 0%{?fedora}
-%global xapian_core_support ON
-%global clang_support ON
-%else
-%global xapian_core_support OFF
-%global clang_support OFF
-%endif
-
-%global stable 1
-
-%if 0%{?stable}
-%global irelease 2
-%else
-%global commit e18f715eb55121a4219d00bc4d824cebf1fb504b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20220217
-%global irelease 0.%{date}git%{shortcommit}
-%endif
-
 Summary: A documentation system for C/C++
 Name:    doxygen
-Epoch:   2
-Version: 1.9.6
-%if 0%{?stable}
-Release: 7%{?dist}
-%else
-%global commit e18f715eb55121a4219d00bc4d824cebf1fb504b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20220217
-Release: 0.%{date}git%{shortcommit}.1
-%endif
+Epoch:   1
+Version: 1.8.13
+Release: 5%{?dist}
+
+# To bootstrap on Modularity, disable checks and enable bootstrap per default:
+%bcond_with check
+%bcond_without bootstrap
+
+
 # No version is specified.
-License: GPL-1.0-or-later
-Url: https://github.com/doxygen
-%if 0%{?stable}
-Source0: https://sourceforge.net/projects/doxygen/files/rel-%{version}/%{name}-%{version}.src.tar.gz
-%else
-Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
-%endif
+License: GPL+
+Url: http://www.stack.nl/~dimitri/doxygen/index.html
+Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 # this icon is part of kdesdk
-Source1: doxywizard.desktop
-# these icons are part of doxygen and converted from doxywizard.ico
-Source2: doxywizard-icons.tar.xz
+Source1: doxywizard.png
+Source2: doxywizard.desktop
+
 # upstream patches
-Patch0: doxygen-obsolete-egrep.patch
+Patch100: https://github.com/doxygen/doxygen/pull/555.patch#/doxygen-xmlgen-regression.patch
+Patch101: doxygen-1.8.13-#775493.patch
+Patch102: doxygen-1.8.13-#776988.patch

-BuildRequires: %{_bindir}/python3
-BuildRequires: gcc-c++ gcc
-BuildRequires: perl-interpreter, perl-open
-BuildRequires: texlive-bibtex
-
-%if ! 0%{?_module_build}
+BuildRequires: perl
+%if %{without bootstrap}
 BuildRequires: tex(dvips)
 BuildRequires: tex(latex)
-# From doc/manual.sty
-BuildRequires: tex(helvet.sty)
+BuildRequires: tex(multirow.sty)
 BuildRequires: tex(sectsty.sty)
 BuildRequires: tex(tocloft.sty)
-BuildRequires: tex(fontenc.sty)
-BuildRequires: tex(fancyhdr.sty)
-# From templates/latex/doxygen.sty
-BuildRequires: tex(alltt.sty)
-BuildRequires: tex(calc.sty)
-BuildRequires: tex(float.sty)
-BuildRequires: tex(verbatim.sty)
-BuildRequires: tex(xcolor.sty)
-BuildRequires: tex(fancyvrb.sty)
-BuildRequires: tex(tabularx.sty)
-BuildRequires: tex(multirow.sty)
-BuildRequires: tex(hanging.sty)
-BuildRequires: tex(ifpdf.sty)
-BuildRequires: tex(adjustbox.sty)
-BuildRequires: tex(amssymb.sty)
-BuildRequires: tex(stackengine.sty)
-BuildRequires: tex(ulem.sty)
-# From doc/doxygen_manual.tex
-BuildRequires: tex(ifthen.sty)
-BuildRequires: tex(array.sty)
-BuildRequires: tex(geometry.sty)
-BuildRequires: tex(makeidx.sty)
-BuildRequires: tex(natbib.sty)
-BuildRequires: tex(graphicx.sty)
-BuildRequires: tex(multicol.sty)
-BuildRequires: tex(float.sty)
-BuildRequires: tex(geometry.sty)
-BuildRequires: tex(listings.sty)
-BuildRequires: tex(color.sty)
-BuildRequires: tex(xcolor.sty)
-BuildRequires: tex(textcomp.sty)
-BuildRequires: tex(wasysym.sty)
-BuildRequires: tex(import.sty)
-BuildRequires: tex(appendix.sty)
-BuildRequires: tex(hyperref.sty)
-BuildRequires: tex(pspicture.sty)
-BuildRequires: tex(inputenc.sty)
-BuildRequires: tex(mathptmx.sty)
-BuildRequires: tex(courier.sty)
-# From src/latexgen.cpp
-BuildRequires: tex(fixltx2e.sty)
-BuildRequires: tex(ifxetex.sty)
-BuildRequires: tex(caption.sty)
-BuildRequires: tex(etoc.sty)
-# From src/util.cpp
-BuildRequires: tex(newunicodechar.sty)
-# From templates/latex/tabu_doxygen.sty
-BuildRequires: tex(varwidth.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
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: graphviz
-%endif
+%else
 BuildRequires: zlib-devel
+%endif
 BuildRequires: flex
 BuildRequires: bison
 BuildRequires: cmake
-BuildRequires: git
-%if "x%{?xapian_core_support}" == "xON"
 BuildRequires: xapian-core-devel
-%endif
-%if "x%{?clang_support}" == "xON"
-BuildRequires: llvm-devel
-BuildRequires: clang-devel
-%endif
-Requires: perl-interpreter
-Requires: graphviz
+
+Requires: perl

 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@ -135,12 +56,11 @@ documentation is extracted directly from the sources. Doxygen can
 also be configured to extract the code structure from undocumented
 source files.

-%if ! 0%{?_module_build}
+%if %{without bootstrap}
 %package doxywizard
 Summary: A GUI for creating and editing configuration files
 Requires: %{name} = %{epoch}:%{version}-%{release}
-BuildRequires: qt5-qtbase-devel
-
+BuildRequires: qt4-devel
 %description doxywizard
 Doxywizard is a GUI for creating and editing configuration files that
 are used by doxygen.
@ -149,83 +69,23 @@ are used by doxygen.
 Summary: Support for producing latex/pdf output from doxygen
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: tex(latex)
-Requires: tex(dvips)
-Requires: texlive-wasy
 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
-# From doc/manual.sty
-Requires: tex(helvet.sty)
+Requires: tex(multirow.sty)
 Requires: tex(sectsty.sty)
 Requires: tex(tocloft.sty)
-Requires: tex(fontenc.sty)
-Requires: tex(fancyhdr.sty)
-# From templates/latex/doxygen.sty
-Requires: tex(alltt.sty)
-Requires: tex(calc.sty)
-Requires: tex(float.sty)
-Requires: tex(verbatim.sty)
-Requires: tex(xcolor.sty)
-Requires: tex(fancyvrb.sty)
-Requires: tex(tabularx.sty)
-Requires: tex(multirow.sty)
-Requires: tex(hanging.sty)
-Requires: tex(ifpdf.sty)
-Requires: tex(adjustbox.sty)
-Requires: tex(amssymb.sty)
-Requires: tex(stackengine.sty)
-Requires: tex(ulem.sty)
-# From doc/doxygen_manual.tex
-Requires: tex(ifthen.sty)
-Requires: tex(array.sty)
-Requires: tex(geometry.sty)
-Requires: tex(makeidx.sty)
-Requires: tex(natbib.sty)
-Requires: tex(graphicx.sty)
-Requires: tex(multicol.sty)
-Requires: tex(float.sty)
-Requires: tex(geometry.sty)
-Requires: tex(listings.sty)
-Requires: tex(color.sty)
-Requires: tex(xcolor.sty)
-Requires: tex(textcomp.sty)
-Requires: tex(wasysym.sty)
-Requires: tex(import.sty)
-Requires: tex(appendix.sty)
-Requires: tex(hyperref.sty)
-Requires: tex(pspicture.sty)
-Requires: tex(inputenc.sty)
-Requires: tex(mathptmx.sty)
-Requires: tex(courier.sty)
-# From src/latexgen.cpp
-Requires: tex(fixltx2e.sty)
-Requires: tex(ifxetex.sty)
-Requires: tex(caption.sty)
-Requires: tex(etoc.sty)
-# From src/util.cpp
-Requires: tex(newunicodechar.sty)
-# From templates/latex/tabu_doxygen.sty
-Requires: tex(varwidth.sty)
-# I'm 99% sure this isn't needed anymore since
-# doxygen has a local fork of tabu... but it doesn't seem to be hurting anything.
-Requires: tex(tabu.sty)
-# There also does not seem to be any references to xtab in the code... but eh.
 Requires: tex(xtab.sty)
-# Explicitly called binaries
-Requires: texlive-bibtex
-Requires: texlive-makeindex
-Requires: texlive-epstopdf
+Requires: tex(import.sty)
+Requires: tex(tabu.sty)
+Requires: tex(appendix.sty)
+Requires: texlive-epstopdf-bin
 %endif
-
 %description latex
 %{summary}.
 %endif


 %prep
-%if 0%{?stable}
-%autosetup -p1 -a2
-%else
-%autosetup -n %{name}-%{commit} -a2
-%endif
+%autosetup -p1

 # convert into utf-8
 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
@ -234,21 +94,21 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO


 %build
-%if ! 0%{?_module_build}
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%if %{without bootstrap}
 %cmake \
-      -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-      -Duse_libclang=%{clang_support} \
-      -Dbuild_doc=OFF \
+      -Dbuild_doc=ON \
      -Dbuild_wizard=ON \
      -Dbuild_xmlparser=ON \
-      -Dbuild_search=%{xapian_core_support} \
+      -Dbuild_search=ON \
      -DMAN_INSTALL_DIR=%{_mandir}/man1 \
      -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
      -DBUILD_SHARED_LIBS=OFF \
+      ..
 %else
 %cmake \
-      -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-      -Duse_libclang=%{clang_support} \
      -Dbuild_doc=OFF \
      -Dbuild_wizard=OFF \
      -Dbuild_xmlparser=ON \
@ -256,300 +116,64 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
      -DMAN_INSTALL_DIR=%{_mandir}/man1 \
      -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
      -DBUILD_SHARED_LIBS=OFF \
+      ..
 %endif
+popd

-%cmake_build %{?_smp_mflags}
+%if %{without bootstrap}
+make docs %{?_smp_mflags} -C %{_target_platform}
+%else
+mkdir -p *-redhat-linux-gnu/latex
+touch *-redhat-linux-gnu/latex/doxygen_manual.pdf
+%endif
+make %{?_smp_mflags} -C %{_target_platform}

 %install
-%cmake_install
+make install DESTDIR=%{buildroot} -C %{_target_platform}

-# install icons
-icondir=%{buildroot}%{_datadir}/icons/hicolor
-mkdir -m755 -p $icondir/{16x16,32x32,48x48,128x128}/apps
-install -m644 -p -D doxywizard-6.png $icondir/16x16/apps/doxywizard.png
-install -m644 -p -D doxywizard-5.png $icondir/32x32/apps/doxywizard.png
-install -m644 -p -D doxywizard-4.png $icondir/48x48/apps/doxywizard.png
-install -m644 -p -D doxywizard-3.png $icondir/128x128/apps/doxywizard.png
+install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png

 # install man pages
 mkdir -p %{buildroot}/%{_mandir}/man1
 cp doc/*.1 %{buildroot}/%{_mandir}/man1/
-%if 0%{?_module_build}
+%if ! %{without bootstrap}
 rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
 %endif

-%if "x%{?xapian_core_support}" == "xOFF"
-rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1*
-%endif
-
 # remove duplicate
 rm -rf %{buildroot}/%{_docdir}/packages

-%if ! 0%{?_module_build}
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+%if %{without bootstrap}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 %endif

-%check
-%ctest
-
 %files
 %doc LANGUAGE.HOWTO README.md
-%license LICENSE
-%if ! 0%{?_module_build}
-%if "x%{?xapian_core_support}" == "xON"
+%if %{without bootstrap}
+%doc %{_target_platform}/latex/doxygen_manual.pdf
+%doc %{_target_platform}/html
 %{_bindir}/doxyindexer
 %{_bindir}/doxysearch*
 %endif
-%endif
 %{_bindir}/doxygen
 %{_mandir}/man1/doxygen.1*
-%if "x%{?xapian_core_support}" == "xON"
 %{_mandir}/man1/doxyindexer.1*
 %{_mandir}/man1/doxysearch.1*
-%endif
-%if ! 0%{?_module_build}
+
+%if %{without bootstrap}
 %files doxywizard
 %{_bindir}/doxywizard
 %{_mandir}/man1/doxywizard*
 %{_datadir}/applications/doxywizard.desktop
 %endif
-%{_datadir}/icons/hicolor/*/apps/doxywizard.png
+%{_datadir}/pixmaps/doxywizard.png

-%if ! 0%{?_module_build}
+%if %{without bootstrap}
 %files latex
 # intentionally left blank
 %endif

 %changelog
-* Fri Mar 10 2023 Than Ngo <than@redhat.com> - 2:1.9.6-7
- replace obsolescent egrep with grep -E 
-
-* Fri Feb 17 2023 Than Ngo <than@redhat.com> - 2:1.9.6-6
- migrated to SPDX license
-
-* Wed Jan 25 2023 Than Ngo <than@redhat.com> - 2:1.9.6-5
- rebuilt against new ghostscript-10 
-
-* Fri Jan 20 2023 Than Ngo <than@redhat.com> - 2:1.9.6-4
- fixed bz#2162170, add Require on texlive-wasy
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 18 2023 Than Ngo <than@redhat.com> - 2:1.9.6-2
- fixed bz#2161515 - doxygen FTBFS if _module_build is 1
-
-* Tue Jan 03 2023 Than Ngo <than@redhat.com> - 2:1.9.6-1
- fixed bz#2156564, update to 1.9.6
-
-* Sun Sep 18 2022 Pete Walter <pwalter@fedoraproject.org> - 2:1.9.5-2
- Rebuild for llvm 15
-
-* Fri Sep 09 2022 Than Ngo <than@redhat.com> - 2:1.9.5-1
- 1.9.5
-
-* Thu Aug 04 2022 Than Ngo <than@redhat.com> - 2:1.9.4-2
- Fixed #2113876, Failed to build LaTex output 
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.4-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri May 06 2022 Than Ngo <than@redhat.com> - 2:1.9.4-1
- 1.9.4
-
-* Thu Feb 17 2022 Than Ngo <than@redhat.com> - 2:1.9.4-0.20220217gite18f715e
- update to 1.9.4 snapshot
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Oct 27 2021 Than Ngo <than@redhat.com> - 2:1.9.1-12
- revert 1.9.1, noarch package built differently on different architectures 
-
-* Wed Oct 27 2021 Than Ngo <than@redhat.com> - 1:1.9.2-4
- update
-
-* Thu Oct 07 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.2-3
- Rebuild for llvm-13.0.0
-
-* Sun Sep 12 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.9.2-2
- Use predictable and reproducible filenames (rhbz#2000138)
-
-* Thu Aug 19 2021 Than Ngo <than@redhat.com> - 1:1.9.2-1
- rebase to 1.9.2
-
-* Tue Aug 17 2021 Björn Esser <besser82@fedoraproject.org> - 1:1.9.1-11
- Rebuild for clang-13.0.0
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 1:1.9.1-9
- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Sun Mar 21 2021 Than Ngo <than@redhat.com> - 1:1.9.1-8
- update source
-
-* Mon Feb 22 2021 Than Ngo <than@redhat.com> - 1:1.9.1-7
- drop test-suite
-
-* Wed Feb 10 2021 Than Ngo <than@redhat.com> - 1:1.9.1-6
- fixed Coverity issues
- fixed crash in docparser
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.1-4
- Rebuild for clang-11.1.0
-
-* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-3
- fixed doxygen crashes when parsing config file part2
-
-
-* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-2
- fixed bz#1916161, crashes when parsing config file
-
-* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.9.1-1
- update to 1.9.1
-
-* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.8.20-6
- drop BR on ImageMagick in RHEL
-
-* Tue Sep 29 2020 Than Ngo <than@redhat.com> - 1.8.20-5
- backport upstream patches
-
-* Thu Sep 17 2020 Than Ngo <than@redhat.com> - 1.8.20-4
- Fix doxygen crash
-
-* Tue Sep 15 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.8.20-3
- Fix doxygen producing different results on 32 and 64 bit architectures
-
-* Fri Aug 28 2020 Scott Talbert <swt@techie.net> - 1:1.8.20-2
- Fix issue with enums being defined in multiple files
-
-* Tue Aug 25 2020 Than Ngo <than@redhat.com> - 1.8.20-1
- update to 1.8.20
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-6
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 08 2020 Than Ngo <than@redhat.com> - 1.8.18-4
- fixed link issue against new clang
-
-* Thu Jun 18 2020 Than Ngo <than@redhat.com> - 1.8.18-3
- fixed bz#1834591, enable clang support in fedora
-
-* Wed May 27 2020 Tom Callaway <spot@fedoraproject.org> - 1.8.18-2
- update tex dependencies
-
-* Mon May 25 2020 Than Ngo <than@redhat.com> - 1.8.18-1
- update to 1.8.18
- backport fixes: buffer-overflow, memory leeks and md5 hash does not match for
-  2 diffferent runs
-
-* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 1:1.8.17-3
- Fix string quoting for rpm >= 4.16
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 14 2020 Than Ngo <than@redhat.com> - 1:1.8.17-1
- resolves #1786799, update to 1.8.17
-
-* Tue Dec 10 2019 Than Ngo <than@redhat.com> - 1:1.8.16-3
- fixed covscan issues
-
-* Mon Sep 16 2019 Than Ngo <than@redhat.com> - 1:1.8.16-2
- backpored upstream patch to fix #7248
-
-* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 1:1.8.16-1
- resolves #1742614, update to 1.8.16
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Mar 19 2019 Christoph Junghans <junghans@votca.org> - 1:1.8.15-9
- Incl. xml fix for c++11
-
-* Sat Mar 16 2019 Than Ngo <than@redhat.com> - 1:1.8.15-8
- added license file
-
-* Wed Mar 13 2019 Than Ngo <than@redhat.com> - 1:1.8.15-7
- added Requirement on dot
-
-* Thu Feb 14 2019 Than Ngo <than@redhat.com> - 1:1.8.15-6
- fixed bz#1677000, fixed multilib issue
-
-* Tue Feb 12 2019 Than Ngo <than@redhat.com> - 1:1.8.15-5
- fixed bz#1675288, doxygen 1.8.15 segfault
-
-* Fri Feb 08 2019 Than Ngo <than@redhat.com> - 1:1.8.15-4
- fixed bz#673228 - operator whitespace changes cause wxpython FTBFS
- fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex 
-
-* Tue Feb 05 2019 Than Ngo <than@redhat.com> - 1:1.8.15-3
- fixed bz#1671999, backported from upstream
- added test for XML output with an empty TOC
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 28 2019 Than Ngo <than@redhat.com> - 1:1.8.15-1
- update to 1.8.15
-
-* Thu Dec 06 2018 Than Ngo <than@redhat.com> - 1:1.8.14-8
- enable testing 
-
-* Mon Jul 23 2018 Than Ngo <than@redhat.com> - 1:1.8.14-7
- add BR: gcc-c++ gcc
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 27 2018 Than Ngo <than@redhat.com> - 1:1.8.14-5
- support Qt5
-
-* Wed Jun 20 2018 Than Ngo <than@redhat.com> - 1.8.14-4
- enble search addon on fedora
-
-* Mon Apr 30 2018 Than Ngo <than@redhat.com> - 1.8.14-3
- added missing BR on adjustbox.sty for refman
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Dec 29 2017 Than Ngo <than@redhat.com> - 1:1.8.14-1
- update to 1.8.14
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 1:1.8.13-10
- perl dependency renamed to perl-interpreter
-  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
-
-* Tue Jul 04 2017 Than Ngo <than@redhat.com> - 1:1.8.13-9
- backport to fix C# property initializer parsing 
- backport to fix non reachable links and redirected links in documentation
-
-* Tue May 30 2017 Than Ngo <than@redhat.com> - 1:1.8.13-8
- backport to fix problem where automatic line breaking caused
-  missing vertical bars in the parameter table for Latex output
-
-* Sat Apr 22 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-7
- fix _module_build macro
-
-* Fri Apr 21 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-6
- use new _module_build macro to limit dependencies for Modularity
-
 * Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5
 - backport to fix behavior of @ref const matching (#776988)

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
-SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
+SHA512 (doxygen-1.8.13.src.tar.gz) = 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
+SHA512 (doxywizard.png) = 42a7e5903bf27463d3b072cf043aef071b519b53054bbe647c522d5e499e02f554867ab5e9971b06493769cc17b9d1588462aeade284de1f9d579cf9f99e8851