replace obsolescent egrep with grep -E

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -46,3 +46,16 @@ 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

doxygen-1.8.13-#775493.patch

@@ -1,93 +0,0 @@
-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);

doxygen-1.8.13-#776988.patch

@@ -1,38 +0,0 @@
-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;

doxygen-1.8.13-C#-property-initializer-parsing.patch

@@ -1,38 +0,0 @@
-commit 14a0bcc74a121525917aefc8c9034e283e94884b
-Author: Piotr Szydełko <wiertel@wiertel.info>
-Date:   Sat May 20 08:14:27 2017 +0200
-
-    Fix C# property initializer parsing
-    
-    int Property {get; set;} = 23;
-    The parser was ending the property at the closing bracket,
-    which resulted in the initializer being assigned to the following property.
-
-diff --git a/src/scanner.l b/src/scanner.l
-index 9ff082d4..632c8a51 100644
---- a/src/scanner.l
-+++ b/src/scanner.l
-@@ -6198,6 +6198,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
- 					  }
-   					}
- <CSAccessorDecl>"{"			{ curlyCount++; }
-+<CSAccessorDecl>"}"{B}*"="		{
-+					  // fall back to next rule if it's not the right bracket
-+					  if (curlyCount != 0) REJECT;
-+					  current->initializer = "=";
-+					  current->endBodyLine=yyLineNr;
-+					  lastInitializerContext = FindMembers;
-+					  BEGIN(ReadInitializer);
-+					}
- <CSAccessorDecl>"}"			{ 
-                                           if (curlyCount) 
-                                           {
-@@ -6207,6 +6215,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
- 					  {
-   					    mtype = Method;
-                                             virt = Normal;
-+					    // not really important, but while we are at it
-+					    current->endBodyLine=yyLineNr;
-                                             unput(';');
- 					    BEGIN(FindMembers);
- 					  }

doxygen-1.8.13-non-reachable-links.patch

@@ -1,568 +0,0 @@
-commit 31cf78d223e52fe078ad9b0651672aeb73926065
-Author: albert-github <albert.tests@gmail.com>
-Date:   Sun Jun 4 12:52:50 2017 +0200
-
-    Correction of non reachable links and redirected links in documentation.
-    
-    The W3C link checker reported a number of problems regarding non reachable links and permanent redirects.
-    Most of these problems have been fixed with this patch
-
-diff --git a/doc/commands.doc b/doc/commands.doc
-index 70b89c60..4357fba1 100644
---- a/doc/commands.doc
-+++ b/doc/commands.doc
-@@ -433,7 +433,7 @@ Structural indicators
-   \par Example:
-   \include enum.h
-   \htmlonly
--  Click <a href="examples/enum/html/class_test.html">here</a>
-+  Click <a href="examples/enum/html/class_enum___test.html">here</a>
-   for the corresponding HTML documentation that is generated by doxygen.
-   \endhtmlonly
-   \latexonly
-@@ -565,7 +565,7 @@ Structural indicators
-   \par Example:
-   \include func.h
-   \htmlonly
--  Click <a href="examples/func/html/class_test.html">here</a>
-+  Click <a href="examples/func/html/class_fn___test.html">here</a>
-   for the corresponding HTML documentation that is generated by doxygen.
-   \endhtmlonly
-   \latexonly
-@@ -823,7 +823,7 @@ Structural indicators
-   \par Example:
-   \include overload.cpp
-   \htmlonly
--  Click <a href="examples/overload/html/class_test.html">here</a>
-+  Click <a href="examples/overload/html/class_overload___test.html">here</a>
-   for the corresponding HTML documentation that is generated by doxygen.
-   \endhtmlonly
-   \latexonly
-@@ -1121,7 +1121,7 @@ Structural indicators
- 
- <hr>
- \section cmdweakgroup \\weakgroup <name> [(title)]
--  \addindex \\addtogroup
-+  \addindex \\weakgroup
-   Can be used exactly like \ref cmdaddtogroup "\\addtogroup", but has
-   a lower priority when it comes to resolving conflicting grouping
-   definitions.
-@@ -1513,7 +1513,7 @@ ALIASES  = "english=\if english" \
-   \par Example:
-   \include par.cpp
-   \htmlonly
--  Click <a href="examples/par/html/class_test.html">here</a>
-+  Click <a href="examples/par/html/class_par___test.html">here</a>
-   for the corresponding HTML documentation that is generated by doxygen.
-   \endhtmlonly
-   \latexonly
-@@ -2704,7 +2704,7 @@ class Receiver
- 
-   \addindex \\startuml
-   Starts a text fragment which should contain a valid description of a
--  PlantUML diagram. See http://plantuml.sourceforge.net/ for examples.
-+  PlantUML diagram. See http://plantuml.com/ for examples.
-   The text fragment ends with \ref cmdenduml "\\enduml".
-   \note You need to install Java and the PlantUML's jar file,
-   if you want to use this command. The location of the jar file should be specified
-diff --git a/doc/customize.doc b/doc/customize.doc
-index f98ce0b4..9ef38919 100644
---- a/doc/customize.doc
-+++ b/doc/customize.doc
-@@ -90,7 +90,7 @@ that are disabled by default:
- 
- To tweak things like fonts or colors, margins, or other look \& feel
- aspects of the HTML output in detail, you can create a different 
--<a href="http://www.w3schools.com/css/default.asp">cascading style sheet</a>. 
-+<a href="https://www.w3schools.com/css/default.asp">cascading style sheet</a>. 
- You can also let doxygen use a custom header and footer for each HTML 
- page it generates, for instance to make the output conform to the style 
- used on the rest of your web site.
-@@ -390,7 +390,7 @@ files as one big DOM tree would not fit into memory.
- 
- See <a href="https://github.com/michaeljones/breathe">the Breathe project</a> for
- an example that uses doxygen XML output from Python to bridge it with the 
--<a href="http://sphinx.pocoo.org/">Sphinx</a> document generator.
-+<a href="http://www.sphinx-doc.org/en/stable/">Sphinx</a> document generator.
- 
- 
- \htmlonly
-diff --git a/doc/docblocks.doc b/doc/docblocks.doc
-index f0499c6f..81cfdd08 100644
---- a/doc/docblocks.doc
-+++ b/doc/docblocks.doc
-@@ -260,7 +260,7 @@ Here is an example of the use of these comment blocks:
- \include afterdoc.h
-  \htmlonly
-  </p>
-- Click <a href="examples/afterdoc/html/class_test.html">here</a>
-+ Click <a href="examples/afterdoc/html/class_afterdoc___test.html">here</a>
-  for the corresponding HTML documentation that is generated by doxygen.
-  \endhtmlonly
-  \latexonly
-@@ -281,7 +281,7 @@ Here is an example of a documented piece of C++ code using the Qt style:
- \include qtstyle.cpp
-  \htmlonly
-  </p>
-- Click <a href="examples/qtstyle/html/class_test.html">here</a>
-+ Click <a href="examples/qtstyle/html/class_q_tstyle___test.html">here</a>
-  for the corresponding HTML documentation that is generated by doxygen.
-  \endhtmlonly
-  \latexonly
-@@ -316,7 +316,7 @@ JavaDoc style and \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" set to YES:
- \include jdstyle.cpp
-  \htmlonly
-  </p>
-- Click <a href="examples/jdstyle/html/class_test.html">here</a>
-+ Click <a href="examples/jdstyle/html/class_javadoc___test.html">here</a>
-  for the corresponding HTML documentation that is generated by doxygen.
-  \endhtmlonly
-  \latexonly
-@@ -634,7 +634,7 @@ need for some more structure, like a block of verbatim text, a list, or a
- simple table. For this doxygen supports the 
- <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a> 
- syntax, including parts of the
--<a href="http://michelf.com/projects/php-markdown/extra/">Markdown Extra</a>
-+<a href="https://michelf.ca/projects/php-markdown/extra/">Markdown Extra</a>
- extension. 
- 
- Markdown is designed to be very easy to read and write. 
-@@ -646,13 +646,13 @@ directly. For more details see chapter \ref markdown.
- For programming language specific formatting doxygen has two
- forms of additional markup on top of Markdown formatting.
- 
--1. <a href="http://en.wikipedia.org/wiki/Javadoc">Javadoc</a> like markup.
-+1. <a href="https://en.wikipedia.org/wiki/Javadoc">Javadoc</a> like markup.
-    See \ref commands for a complete overview of all commands supported by doxygen.
--2. <a href="http://en.wikipedia.org/wiki/C_Sharp_(programming_language)#XML_documentation_system">XML</a> markup
-+2. <a href="https://en.wikipedia.org/wiki/C_Sharp_(programming_language)#XML_documentation_system">XML</a> markup
-    as specified in the C# standard. See \ref xmlcmds for the XML commands supported by doxygen.
- 
- If this is still not enough doxygen also supports a \ref htmlcmds "subset" of 
--the <a href="http://en.wikipedia.org/wiki/HTML">HTML</a> markup language.
-+the <a href="https://en.wikipedia.org/wiki/HTML">HTML</a> markup language.
- 
- \htmlonly
- Go to the <a href="markdown.html">next</a> section or return to the
-diff --git a/doc/extsearch.doc b/doc/extsearch.doc
-index cead851c..99a72195 100644
---- a/doc/extsearch.doc
-+++ b/doc/extsearch.doc
-@@ -52,7 +52,7 @@ The data flow is shown in the following diagram:
- 
- The first step is to make the search engine available via a web server.
- If you use `doxysearch.cgi` this means making the
--<a href="http://en.wikipedia.org/wiki/Common_Gateway_Interface">CGI</a> binary
-+<a href="https://en.wikipedia.org/wiki/Common_Gateway_Interface">CGI</a> binary
- available from the web server (i.e. be able to run it from a 
- browser via an URL starting with http:)
- 
-@@ -187,7 +187,7 @@ The next subsections describe these interfaces in more detail.
- \subsection extsearch_api_index Indexer input format
- 
- The search data produced by doxygen follows the 
--<a href="http://wiki.apache.org/solr/UpdateXmlMessages">Solr XML index message</a>
-+<a href="https://wiki.apache.org/solr/UpdateXmlMessages">Solr XML index message</a>
- format.
- 
- The input for the indexer is an XML file, which consists of one `<add>` tag containing 
-@@ -224,12 +224,12 @@ Each field has a name. The following field names are supported:
- - *text*: the documentation associated with the item. Note that only words are present, no markup.
- 
- @note Due to the potentially large size of the XML file, it is recommended to use a 
--<a href="http://en.wikipedia.org/wiki/Simple_API_for_XML">SAX based parser</a> to process it.
-+<a href="https://en.wikipedia.org/wiki/Simple_API_for_XML">SAX based parser</a> to process it.
- 
- \subsection extsearch_api_search_in Search URL format
- 
- When the search engine is invoked from a doxygen generated HTML page, a number of parameters are
--passed to via the <a href="http://en.wikipedia.org/wiki/Query_string">query string</a>.
-+passed to via the <a href="https://en.wikipedia.org/wiki/Query_string">query string</a>.
- 
- The following fields are passed:
- - *q*:  the query text as entered by the user
-@@ -247,14 +247,14 @@ It represents a query for the word 'list' (`q=list`) requesting 20 search result
- starting with the result number 20 (`p=1`) and using callback 'dummy' (`cb=dummy`):
- 
- 
--@note The values are <a href="http://en.wikipedia.org/wiki/Percent-encoding">URL encoded</a> so they
-+@note The values are <a href="https://en.wikipedia.org/wiki/Percent-encoding">URL encoded</a> so they
- have to be decoded before they can be used.
- 
- \subsection extsearch_api_search_out Search results format
- 
- When invoking the search engine as shown in the previous subsection, it should reply with
- the results. The format of the reply is
--<a href="http://en.wikipedia.org/wiki/JSONP">JSON with padding</a>, which is basically
-+<a href="https://en.wikipedia.org/wiki/JSONP">JSON with padding</a>, which is basically
- a javascript struct wrapped in a function call. The name of function should be the name of
- the callback (as passed with the *cb* field in the query).
- 
-diff --git a/doc/faq.doc b/doc/faq.doc
-index 5af3db83..bbad8c0f 100644
---- a/doc/faq.doc
-+++ b/doc/faq.doc
-@@ -285,7 +285,7 @@ At the time I was looking into \c lex and \c yacc, where a lot of things start w
- \section faq_why What was the reason to develop doxygen?
- 
- I once wrote a GUI widget based on the Qt library (it is still available at
--http://sourceforge.net/projects/qdbttabular/ but hasn't been updated since 2002). 
-+https://sourceforge.net/projects/qdbttabular/ but hasn't been updated since 2002). 
- Qt had nicely generated documentation (using an internal tool which 
- <a href="http://rant.gulbrandsen.priv.no/udoc/history">they didn't want to release</a>) 
- and I wrote similar docs by hand. 
-diff --git a/doc/formulas.doc b/doc/formulas.doc
-index 650751e8..1649c197 100644
---- a/doc/formulas.doc
-+++ b/doc/formulas.doc
-@@ -30,7 +30,7 @@ have the following tools installed
-     to bitmaps. I have used Aladdin GhostScript 8.0 for testing.
- </ul>
- For the HTML output there is also an alternative solution using
--<a href="http://www.mathjax.org">MathJax</a> which does not
-+<a href="https://www.mathjax.org">MathJax</a> which does not
- require the above tools. If you enable \ref cfg_use_mathjax "USE_MATHJAX" in
- the config then the latex formulas will be copied to the HTML "as is" and a
- client side javascript will parse them and turn them into (interactive) images.
-diff --git a/doc/grouping.doc b/doc/grouping.doc
-index bbb577cf..2c4ebe19 100644
---- a/doc/grouping.doc
-+++ b/doc/grouping.doc
-@@ -197,7 +197,7 @@ documentation of the class.
- 
- \htmlonly
- </p>
--Click <a href="examples/memgrp/html/class_test.html">here</a> 
-+Click <a href="examples/memgrp/html/class_memgrp___test.html">here</a> 
- for the corresponding HTML documentation that is generated by doxygen.
- \endhtmlonly
- \latexonly
-diff --git a/doc/index.doc b/doc/index.doc
-index c8950c4c..14f03961 100644
---- a/doc/index.doc
-+++ b/doc/index.doc
-@@ -180,7 +180,7 @@ Thanks go to:
- <li>Talin for adding support for C# style comments with XML markup.
- <li>Petr Prikryl for coordinating the internationalization support.
-     All language maintainers for providing translations into many languages.
--<li>The band <a href="http://www.porcupinetree.com">Porcupine Tree</a> for 
-+<li>The band <a href="http://www.porcupinetree.com/">Porcupine Tree</a> for 
-     providing hours of great music to listen to while coding.
- <li>many, many others for suggestions, patches and bug reports.
- </ul>
-diff --git a/doc/install.doc b/doc/install.doc
-index fd4f28d1..22d6e7cc 100644
---- a/doc/install.doc
-+++ b/doc/install.doc
-@@ -37,7 +37,7 @@ following to build the executable:
-     \addindex strip
-     \addindex python
- <li>In order to generate a \c Makefile for your platform, you need 
--    <a href="http://www.cmake.org/">cmake</a> version 2.8.12 or later.
-+    <a href="https://cmake.org/">cmake</a> version 2.8.12 or later.
-     \addindex cmake
- </ul>
- 
-@@ -63,7 +63,7 @@ tools should be installed.
- <li>For formulas in the HTML output (when MathJax is not used)
-     or in case you do not wish to use `pdflatex,
-     the ghostscript interpreter is needed. You can find it at 
--    <a href="http://www.ghostscript.com/">www.ghostscript.com</a>.
-+    <a href="https://www.ghostscript.com/">www.ghostscript.com</a>.
- </ul>
- 
- Compilation is now done by performing the following steps:
-@@ -150,20 +150,20 @@ standard installation procedure that is required for these packages.
- \section install_src_windows Compiling from source on Windows
- 
- From version 1.8.10 onwards, build files need to be generated by cmake.
--cmake can be downloaded from http://www.cmake.org/download/
-+cmake can be downloaded from https://cmake.org/download/
- 
- At the moment only the express version of Visual Studio 2013 is tested,
- but other version might also work.
- 
- Alternatively, you can compile doxygen 
- \ref install_src_unix "the UNIX way" using 
--<a href="http://en.wikipedia.org/wiki/Cygwin">Cygwin</a>
-+<a href="https://en.wikipedia.org/wiki/Cygwin">Cygwin</a>
- or <a href="http://www.mingw.org/">MinGW</a>.
- 
- The next step is to install modern versions of \c bison and \c flex
--(see http://sourceforge.net/projects/winflexbison. After installation and adding them to
-+(see https://sourceforge.net/projects/winflexbison/. After installation and adding them to
- your `path` rename `win_flex.exe` to `flex.exe` and `win_bison.exe` to `bison.exe`)
--Furthermore you have to install \c python (version 2.6 or higher, see http://www.python.org).
-+Furthermore you have to install \c python (version 2.6 or higher, see https://www.python.org).
- These packages are needed during the compilation process.
- 
- Download doxygen's source tarball and put it somewhere (e.g. use <code>c:\\tools</code>)
-@@ -214,19 +214,19 @@ you need qhelpgenerator which is part of Qt.
- You can download Qt from <a href="http://qt-project.org/downloads">Qt Software Downloads</a>.
- 
- In order to generate PDF output or use scientific formulas you will also need to
--install <a href="http://en.wikipedia.org/wiki/LaTeX">LaTeX</a> and 
--<a href="http://en.wikipedia.org/wiki/Ghostscript">Ghostscript</a>. 
-+install <a href="https://en.wikipedia.org/wiki/LaTeX">LaTeX</a> and 
-+<a href="https://en.wikipedia.org/wiki/Ghostscript">Ghostscript</a>. 
- 
- For \LaTeX a number of distributions exists. Popular ones that should work with
--doxygen are <a href="http://www.miktex.org">MikTex</a> 
-+doxygen are <a href="https://miktex.org/">MikTex</a> 
- and <a href="http://www.tug.org/protext/">proTeXt</a>.
- 
--Ghostscript can be <a href="http://sourceforge.net/projects/ghostscript/">downloaded</a> 
-+Ghostscript can be <a href="https://sourceforge.net/projects/ghostscript/">downloaded</a> 
- from Sourceforge.
- 
- After installing \LaTeX and Ghostscript you'll need to make sure the tools
- latex.exe, pdflatex.exe, and gswin32c.exe are present in the search path of a
--command box. Follow <a href="http://www.computerhope.com/issues/ch000549.htm">these</a>
-+command box. Follow <a href="https://www.computerhope.com/issues/ch000549.htm">these</a>
- instructions if you are unsure and run the commands from a command box to verify it works.
- 
- \htmlonly
-diff --git a/doc/markdown.doc b/doc/markdown.doc
-index 300d7fc7..737df71a 100644
---- a/doc/markdown.doc
-+++ b/doc/markdown.doc
-@@ -41,9 +41,9 @@ the extensions that doxygen supports.
- Finally section \ref markdown_dox discusses some specifics for doxygen's
- implementation of the Markdown standard.
- 
--[markdown]: http://daringfireball.net/projects/markdown 
--[mdextra]:  http://michelf.com/projects/php-markdown/extra/
--[github]:   http://github.github.com/github-flavored-markdown/
-+[markdown]: http://daringfireball.net/projects/markdown/ 
-+[mdextra]:  https://michelf.ca/projects/php-markdown/extra/
-+[github]:   https://github.github.com/github-flavored-markdown/
- 
- \section markdown_std Standard Markdown
- 
-@@ -303,7 +303,7 @@ Note that using `[TOC]` is the same as using a
- \subsection md_tables Tables
- 
- Of the features defined by "Markdown Extra" is support for
--<a href="http://michelf.com/projects/php-markdown/extra/#table">simple tables</a>:
-+<a href="https://michelf.ca/projects/php-markdown/extra/#table">simple tables</a>:
- 
- A table consists of a header line, a separator line, and at least one
- row line. Table columns are separated by the pipe (|) character.
-@@ -376,7 +376,7 @@ For more complex tables in doxygen please have a look at: \ref tables
- \subsection md_fenced Fenced Code Blocks
- 
- Another feature defined by "Markdown Extra" is support for
--<a href="http://michelf.com/projects/php-markdown/extra/#fenced-code-blocks">
-+<a href="https://michelf.ca/projects/php-markdown/extra/#fenced-code-blocks">
- fenced code blocks</a>:
- 
- A fenced code block does not require indentation, and is
-diff --git a/doc/searching.doc b/doc/searching.doc
-index dcf858fa..00c61414 100644
---- a/doc/searching.doc
-+++ b/doc/searching.doc
-@@ -72,7 +72,7 @@ has its own advantages and disadvantages:
-    searching, meaning that you could use your own indexer and search engine 
-    of choice. To make life easier doxygen ships with an example indexer 
-    (doxyindexer) and search engine (doxysearch.cgi) based on 
--   the <a href="http://xapian.org/">Xapian</a> open source search engine 
-+   the <a href="https://xapian.org/">Xapian</a> open source search engine 
-    library.
- 
-    To enable this search method set 
-@@ -147,7 +147,7 @@ has its own advantages and disadvantages:
-    \ref cfg_qhp_namespace "QHP_NAMESPACE", 
-    \ref cfg_qhg_location "QHG_LOCATION", 
-    \ref cfg_qhp_virtual_folder "QHP_VIRTUAL_FOLDER".
--   See <a href="http://doc.qt.digia.com/qq/qq28-qthelp.html#htmlfilesandhelpprojects">this article</a> 
-+   See <a href="http://doc.qt.io/archives/qq/qq28-qthelp.html#htmlfilesandhelpprojects">this article</a> 
-    for more info.
- 
-    Feature wise the Qt compressed help feature is comparable with the CHM 
-diff --git a/doc/starting.doc b/doc/starting.doc
-index bfb8e8f7..c869867b 100644
---- a/doc/starting.doc
-+++ b/doc/starting.doc
-@@ -263,7 +263,7 @@ capabilities of the man page format, so some information
- \subsection docbook_out DocBook output
- \addindex docbook
- Doxygen can also generate output in the 
--<a href="http://www.docbook.org/">DocBook</a> format. How to process the
-+<a href="http://docbook.org/">DocBook</a> format. How to process the
- DocBook output is beyond the scope of this manual.
- 
- \section step3 Step 3: Documenting the sources
-diff --git a/src/config.xml b/src/config.xml
-index 0fdf3efc..8bb6addb 100644
---- a/src/config.xml
-+++ b/src/config.xml
-@@ -215,7 +215,7 @@ Go to the <a href="commands.html">next</a> section or return to the
-  This tag specifies the encoding used for all characters in the config file that 
-  follow. The default is UTF-8 which is also the encoding used for all text before
-  the first occurrence of this tag. Doxygen uses \c libiconv (or the iconv built into
-- \c libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-+ \c libc) for the transcoding. See https://www.gnu.org/software/libiconv/ for the list of
-  possible encodings.
- ]]>
-       </docs>
-@@ -661,7 +661,7 @@ Go to the <a href="commands.html">next</a> section or return to the
-       <docs>
- <![CDATA[
-  Set the \c SIP_SUPPORT tag to \c YES if your project consists 
-- of <a href="http://www.riverbankcomputing.co.uk/software/sip/intro">sip</a> sources only. 
-+ of <a href="https://www.riverbankcomputing.com/software/sip/intro">sip</a> sources only. 
-  Doxygen will parse them like normal C++ but will assume all classes use public 
-  instead of private inheritance when no explicit protection keyword is present. 
- ]]>
-@@ -1172,7 +1172,7 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
-  The \c CITE_BIB_FILES tag can be used to specify one or more \c bib files 
-  containing the reference definitions. This must be a list of <code>.bib</code> files. The 
-  <code>.bib</code> extension is automatically appended if omitted. This requires the 
-- \c bibtex tool to be installed. See also http://en.wikipedia.org/wiki/BibTeX for
-+ \c bibtex tool to be installed. See also https://en.wikipedia.org/wiki/BibTeX for
-  more info. For \f$\mbox{\LaTeX}\f$ the style of the bibliography can be controlled 
-  using \ref cfg_latex_bib_style "LATEX_BIB_STYLE".
-  To use this feature you need \c bibtex and \c perl available in the search path.
-@@ -1285,7 +1285,7 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
-  This tag can be used to specify the character encoding of the source files that 
-  doxygen parses. Internally doxygen uses the UTF-8 encoding.
-  Doxygen uses `libiconv` (or the `iconv` built into `libc`) for the transcoding. 
-- See <a href="http://www.gnu.org/software/libiconv">the libiconv documentation</a> for 
-+ See <a href="https://www.gnu.org/software/libiconv/">the libiconv documentation</a> for 
-  the list of possible encodings.
- ]]>
-       </docs>
-@@ -1585,7 +1585,7 @@ to disable this feature.
-  If the \c USE_HTAGS tag is set to \c YES then the references to source code
-  will point to the HTML generated by the \c htags(1) tool instead of doxygen
-  built-in source browser. The \c htags tool is part of GNU's global source
-- tagging system (see http://www.gnu.org/software/global/global.html). You 
-+ tagging system (see https://www.gnu.org/software/global/global.html). You 
-  will need version 4.8.6 or higher. 
- <br>
-  To use it do the following:
-@@ -1904,7 +1904,7 @@ hr.footer {
-  The \c HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
-  Doxygen will adjust the colors in the style sheet and background images 
-  according to this color. Hue is specified as an angle on a colorwheel, 
-- see http://en.wikipedia.org/wiki/Hue for more information. 
-+ see https://en.wikipedia.org/wiki/Hue for more information. 
-  For instance the value 0 represents red, 60 is yellow, 120 is green, 
-  180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
- ]]>
-@@ -1981,14 +1981,14 @@ hr.footer {
- <![CDATA[
-  If the \c GENERATE_DOCSET tag is set to \c YES, additional index files
-  will be generated that can be used as input for 
-- <a href="http://developer.apple.com/tools/xcode/">Apple's Xcode 3
-+ <a href="https://developer.apple.com/tools/xcode/">Apple's Xcode 3
-  integrated development environment</a>, introduced with OSX 10.5 (Leopard).
-  To create a documentation set, doxygen will generate a Makefile in the
-  HTML output directory. Running \c make will produce the docset in that
-  directory and running <code>make install</code> will install the docset in 
-  <code>~/Library/Developer/Shared/Documentation/DocSets</code> 
-  so that Xcode will find it at startup. See
-- http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for
-+ https://developer.apple.com/tools/creatingdocsetswithdoxygen.html for
-  more information.
- ]]>
-       </docs>
-@@ -2133,7 +2133,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
- <![CDATA[
-  The \c QHP_NAMESPACE tag specifies the namespace to use when generating
-  Qt Help Project output. For more information please see
-- <a href="http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
-+ <a href="http://doc.qt.io/qt-4.8/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
- ]]>
-       </docs>
-     </option>
-@@ -2142,7 +2142,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
- <![CDATA[
-  The \c QHP_VIRTUAL_FOLDER tag specifies the namespace to use when
-  generating Qt Help Project output. For more information please see
-- <a href="http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
-+ <a href="http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
- ]]>
-       </docs>
-     </option>
-@@ -2150,7 +2150,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-       <docs>
- <![CDATA[
-   If the \c QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom filter to add. For more information please see
--  <a href="http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-+  <a href="http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
- ]]>
-       </docs>
-     </option>
-@@ -2159,7 +2159,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
- <![CDATA[
-   The \c QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the custom filter to add.
-   For more information please see
--  <a href="http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-+  <a href="http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
- ]]>
-       </docs>
-     </option>
-@@ -2167,7 +2167,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-       <docs>
- <![CDATA[
-   The \c QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's filter section matches.
--  <a href="http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-+  <a href="http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
- ]]>
-       </docs>
-     </option>
-@@ -2295,7 +2295,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-       <docs>
- <![CDATA[
-  Enable the \c USE_MATHJAX option to render \f$\mbox{\LaTeX}\f$ formulas using MathJax 
-- (see http://www.mathjax.org) which uses client side Javascript for the 
-+ (see https://www.mathjax.org) which uses client side Javascript for the 
-  rendering instead of using pre-rendered bitmaps. Use this if you do not 
-  have \f$\mbox{\LaTeX}\f$ installed or if you want to formulas look prettier in the HTML 
-  output. When enabled you may also need to install MathJax separately and 
-@@ -2327,7 +2327,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-  \c MATHJAX_RELPATH should be <code>../mathjax</code>. The default value points to 
-  the MathJax Content Delivery Network so you can quickly see the result without 
-  installing MathJax.  However, it is strongly recommended to install a local 
-- copy of MathJax from http://www.mathjax.org before deployment.
-+ copy of MathJax from https://www.mathjax.org before deployment.
- ]]>
-       </docs>
-     </option>
-@@ -2427,7 +2427,7 @@ See the section \ref extsearch for details.
-  the search results.
-  <br>Doxygen ships with an example indexer (\c doxyindexer) and 
-  search engine (<code>doxysearch.cgi</code>) which are based on the open source search 
-- engine library <a href="http://xapian.org/">Xapian</a>.
-+ engine library <a href="https://xapian.org/">Xapian</a>.
-  <br>See the section \ref extsearch for details.
- ]]>
-       </docs>
-@@ -2440,7 +2440,7 @@ See the section \ref extsearch for details.
-  is enabled.
-  <br>Doxygen ships with an example indexer (\c doxyindexer) and 
-  search engine (<code>doxysearch.cgi</code>) which are based on the open source search 
-- engine library <a href="http://xapian.org/">Xapian</a>.
-+ engine library <a href="https://xapian.org/">Xapian</a>.
-  See the section \ref extsearch for details.
- ]]>
-       </docs>
-@@ -2681,7 +2681,7 @@ or
- <![CDATA[
-  The \c LATEX_BIB_STYLE tag can be used to specify the style to use for the 
-  bibliography, e.g. \c plainnat, or \c ieeetr. 
-- See http://en.wikipedia.org/wiki/BibTeX and \ref cmdcite "\\cite"
-+ See https://en.wikipedia.org/wiki/BibTeX and \ref cmdcite "\\cite"
-  for more info.
- ]]>
-       </docs>
-@@ -2886,7 +2886,7 @@ front of it.
-       <docs>
- <![CDATA[
-  If the \c GENERATE_AUTOGEN_DEF tag is set to \c YES, doxygen will
-- generate an AutoGen Definitions (see http://autogen.sf.net) file
-+ generate an AutoGen Definitions (see http://autogen.sourceforge.net/) file
-  that captures the structure of the code including all
-  documentation. Note that this feature is still experimental 
-  and incomplete at the moment. 

doxygen-1.8.13-verticl_bar_latex.patch

@@ -1,14 +0,0 @@
-diff --git a/src/memberdef.cpp b/src/memberdef.cpp
-index d37efb9..26001a1 100644
---- a/src/memberdef.cpp
-+++ b/src/memberdef.cpp
-@@ -3143,8 +3143,7 @@ void MemberDef::writeMemberDocSimple(OutputList &ol, Definition *container)
-           scope,                   // scope
-           getBodyDef(),            // fileScope
-           this,                    // self
--          ts,                      // text
--          TRUE                     // autoBreak
-+          ts                       // text
-           );
-     }
-     ol.endDoxyAnchor(cfname,memAnchor);

doxygen-obsolete-egrep.patch

@@ -0,0 +1,40 @@
+--- 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"

doxygen-xmlgen-regression.patch

@@ -1,24 +0,0 @@
-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";

doxygen.spec

@@ -1,51 +1,132 @@
+%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:   1
-Version: 1.8.13
-Release: 12%{?dist}
-
+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
 # No version is specified.
-License: GPL+
-Url: http://www.stack.nl/~dimitri/doxygen/index.html
-Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
+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
 # this icon is part of kdesdk
-Source1: doxywizard.png
-Source2: doxywizard.desktop
-
+Source1: doxywizard.desktop
+# these icons are part of doxygen and converted from doxywizard.ico
+Source2: doxywizard-icons.tar.xz
 # upstream patches
-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
-Patch103: doxygen-1.8.13-verticl_bar_latex.patch
-Patch104: doxygen-1.8.13-C#-property-initializer-parsing.patch
-Patch105: doxygen-1.8.13-non-reachable-links.patch
+Patch0: doxygen-obsolete-egrep.patch
+
+BuildRequires: %{_bindir}/python3
+BuildRequires: gcc-c++ gcc
+BuildRequires: perl-interpreter, perl-open
+BuildRequires: texlive-bibtex
 
-BuildRequires: perl-interpreter
 %if ! 0%{?_module_build}
 BuildRequires: tex(dvips)
 BuildRequires: tex(latex)
-BuildRequires: tex(multirow.sty)
+# From doc/manual.sty
+BuildRequires: tex(helvet.sty)
 BuildRequires: tex(sectsty.sty)
 BuildRequires: tex(tocloft.sty)
-BuildRequires: tex(xtab.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(tabu.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(tabu.sty)
 BuildRequires: /usr/bin/epstopdf
 BuildRequires: texlive-epstopdf
 BuildRequires: ghostscript
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: graphviz
-%else
-BuildRequires: zlib-devel
 %endif
+BuildRequires: zlib-devel
 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
 
 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@@ -58,7 +139,8 @@ source files.
 %package doxywizard
 Summary: A GUI for creating and editing configuration files
 Requires: %{name} = %{epoch}:%{version}-%{release}
-BuildRequires: qt4-devel
+BuildRequires: qt5-qtbase-devel
+
 %description doxywizard
 Doxywizard is a GUI for creating and editing configuration files that
 are used by doxygen.
@@ -67,23 +149,83 @@ 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
-Requires: tex(multirow.sty)
+# From doc/manual.sty
+Requires: tex(helvet.sty)
 Requires: tex(sectsty.sty)
 Requires: tex(tocloft.sty)
-Requires: tex(xtab.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(tabu.sty)
 Requires: tex(appendix.sty)
-Requires: texlive-epstopdf-bin
+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
 %endif
+
 %description latex
 %{summary}.
 %endif
 
 
 %prep
-%autosetup -p1
+%if 0%{?stable}
+%autosetup -p1 -a2
+%else
+%autosetup -n %{name}-%{commit} -a2
+%endif
 
 # convert into utf-8
 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
@@ -92,21 +234,21 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
 
 
 %build
-
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
 %if ! 0%{?_module_build}
 %cmake \
-      -Dbuild_doc=ON \
+      -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
+      -Duse_libclang=%{clang_support} \
+      -Dbuild_doc=OFF \
       -Dbuild_wizard=ON \
       -Dbuild_xmlparser=ON \
-      -Dbuild_search=ON \
+      -Dbuild_search=%{xapian_core_support} \
       -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 \
@@ -114,22 +256,20 @@ pushd %{_target_platform}
       -DMAN_INSTALL_DIR=%{_mandir}/man1 \
       -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
       -DBUILD_SHARED_LIBS=OFF \
-      ..
 %endif
-popd
 
-%if ! 0%{?_module_build}
-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}
+%cmake_build %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
-install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png
+# 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 man pages
 mkdir -p %{buildroot}/%{_mandir}/man1
@@ -138,33 +278,42 @@ cp doc/*.1 %{buildroot}/%{_mandir}/man1/
 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 %{SOURCE2}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %endif
 
+%check
+%ctest
+
 %files
 %doc LANGUAGE.HOWTO README.md
+%license LICENSE
 %if ! 0%{?_module_build}
-%doc %{_target_platform}/latex/doxygen_manual.pdf
-%doc %{_target_platform}/html
+%if "x%{?xapian_core_support}" == "xON"
 %{_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}
 %files doxywizard
 %{_bindir}/doxywizard
 %{_mandir}/man1/doxywizard*
 %{_datadir}/applications/doxywizard.desktop
 %endif
-%{_datadir}/pixmaps/doxywizard.png
+%{_datadir}/icons/hicolor/*/apps/doxywizard.png
 
 %if ! 0%{?_module_build}
 %files latex
@@ -172,6 +321,211 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 %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
 

sources

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