replace obsolescent egrep with grep -E

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

.gitignore

@@ -53,3 +53,9 @@ doxygen-1.7.1.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

doxgen-1.9.1-crash-when-parsing-config-file-part2.patch

@@ -1,22 +0,0 @@
-diff -up doxygen/src/configimpl.l.orig doxygen/src/configimpl.l
---- doxygen/src/configimpl.l.orig	2021-01-19 17:25:00.933789247 +0100
-+++ doxygen/src/configimpl.l	2021-01-19 17:26:09.704744240 +0100
-@@ -1175,8 +1175,7 @@ static void substEnvVarsInStrList(String
-   for (const auto &s : sl)
-   {
-     QCString result = s.c_str();
--    // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE.
--    bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1);
-+    bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1) || (result.find('"')!=-1);
-     // here we strip the quote again
-     substEnvVarsInString(result);
- 
-@@ -1229,7 +1228,7 @@ static void substEnvVarsInStrList(String
-       }
-       if (p!=l) // add the leftover as a string
-       {
--        results.push_back(result.right(l-p).data());
-+        results.push_back(result.right(l-p).str());
-       }
-     }
-     else // just goto the next element in the list

doxgen-1.9.1-crash-when-parsing-config-file.patch

@@ -1,64 +0,0 @@
-commit 3b15963316b59cd1af3468a43535d90343916ffb
-Author: Dimitri van Heesch <doxygen@gmail.com>
-Date:   Mon Jan 18 19:59:16 2021 +0100
-
-    issue #8343: doxygen-1.9.1 crashes when parsing config file
-
-diff --git a/src/configimpl.l b/src/configimpl.l
-index 7f73ec01..56a2e108 100644
---- a/src/configimpl.l
-+++ b/src/configimpl.l
-@@ -1210,7 +1210,7 @@ static void substEnvVarsInStrList(StringVector &sl)
-               c=result.at(i);
-               if (c=='"') // end quote
-               {
--                results.push_back(result.mid(p,i-p).data());
-+                results.push_back(result.mid(p,i-p).str());
-                 p=i+1;
-                 break;
-               }
-@@ -1222,7 +1222,7 @@ static void substEnvVarsInStrList(StringVector &sl)
-           }
-           else if (c==' ' || c=='\t') // separator
-           {
--            if (i>p) results.push_back(result.mid(p,i-p).data());
-+            if (i>p) results.push_back(result.mid(p,i-p).str());
-             p=i+1;
-           }
-         }
-@@ -1234,7 +1234,7 @@ static void substEnvVarsInStrList(StringVector &sl)
-     }
-     else // just goto the next element in the list
-     {
--      if (!result.isEmpty()) results.push_back(result.data());
-+      if (!result.isEmpty()) results.push_back(result.str());
-     }
-   }
-   sl = results;
-@@ -1409,7 +1409,7 @@ static void cleanUpPaths(StringVector &str)
-       QFileInfo fi(path.c_str());
-       if (fi.exists() && fi.isDir())
-       {
--        path = fi.absFilePath().utf8().data();
-+        path = fi.absFilePath().utf8().str();
-         if (path[path.size()-1]!='/') path+='/';
-       }
-     }
-@@ -1545,7 +1545,7 @@ void Config::checkAndCorrect()
-     QString p = QDir::currentDirPath();
-     if (p.at(p.length()-1)!='/')
-         p.append('/');
--    stripFromPath.push_back(p.utf8().data());
-+    stripFromPath.push_back(p.utf8().str());
-   }
-   else
-   {
-@@ -1882,7 +1882,7 @@ void Config::checkAndCorrect()
-   if (inputSources.empty())
-   {
-     // use current dir as the default
--    inputSources.push_back(QDir::currentDirPath().utf8().data());
-+    inputSources.push_back(QDir::currentDirPath().utf8().str());
-   }
-   else
-   {

doxygen-1.9.1-Coverity_issues.patch

@@ -1,49 +0,0 @@
-diff -up doxygen-1.9.1/src/context.cpp.me doxygen-1.9.1/src/context.cpp
---- doxygen-1.9.1/src/context.cpp.me	2021-02-10 10:56:44.575251899 +0100
-+++ doxygen-1.9.1/src/context.cpp	2021-02-10 10:57:54.522809720 +0100
-@@ -4062,11 +4062,11 @@ class MemberContext::Private : public De
-         s_inst.addProperty("nameWithContextFor",  &Private::nameWithContextFor);
-         init=TRUE;
-       }
--      if (md && !md->cookie()) { md->setCookie(new MemberContext::Private::Cachable(md)); }
-+      if (!md->cookie()) { md->setCookie(new MemberContext::Private::Cachable(md)); }
- 
-       Cachable &cache = getCache();
-       cache.propertyAttrs.reset(TemplateList::alloc());
--      if (md && md->isProperty())
-+      if (md->isProperty())
-       {
-         if (md->isGettable())           cache.propertyAttrs->append("get");
-         if (md->isPrivateGettable())    cache.propertyAttrs->append("private get");
-@@ -4076,7 +4076,7 @@ class MemberContext::Private : public De
-         if (md->isProtectedSettable())  cache.propertyAttrs->append("protected set");
-       }
-       cache.eventAttrs.reset(TemplateList::alloc());
--      if (md && md->isEvent())
-+      if (md->isEvent())
-       {
-         if (md->isAddable())   cache.eventAttrs->append("add");
-         if (md->isRemovable()) cache.eventAttrs->append("remove");
-diff -up doxygen-1.9.1/src/docparser.cpp.me doxygen-1.9.1/src/docparser.cpp
---- doxygen-1.9.1/src/docparser.cpp.me	2021-02-10 10:58:11.491500540 +0100
-+++ doxygen-1.9.1/src/docparser.cpp	2021-02-10 11:00:35.905512597 +0100
-@@ -1524,7 +1524,7 @@ reparsetoken:
-           {
-             QCString scope;
-             doctokenizerYYsetStateSetScope();
--            doctokenizerYYlex();
-+            (void)doctokenizerYYlex();
-             scope = g_token->name;
-             g_context = scope;
-             //printf("Found scope='%s'\n",scope.data());
-diff -up doxygen-1.9.1/src/dotgroupcollaboration.cpp.me doxygen-1.9.1/src/dotgroupcollaboration.cpp
---- doxygen-1.9.1/src/dotgroupcollaboration.cpp.me	2021-02-10 11:01:10.588530954 +0100
-+++ doxygen-1.9.1/src/dotgroupcollaboration.cpp	2021-02-10 11:02:54.216221350 +0100
-@@ -309,6 +309,7 @@ void DotGroupCollaboration::Edge::write(
-     {
-       if (first) first=FALSE; else t << "\\n";
-       t << DotNode::convertLabel(link->label);
-+      count++;
-     }
-     if (count==maxLabels) t << "\\n...";
-     t << "\"";

doxygen-1.9.1-crash_in_docparser.patch

@@ -1,12 +0,0 @@
-diff -up doxygen-1.9.1/src/docparser.cpp.me doxygen-1.9.1/src/docparser.cpp
---- doxygen-1.9.1/src/docparser.cpp.me	2021-02-10 10:52:09.481086282 +0100
-+++ doxygen-1.9.1/src/docparser.cpp	2021-02-10 10:55:32.418781686 +0100
-@@ -951,7 +951,7 @@ static void handlePendingStyleCommands(D
-       children.append(new DocStyleChange(parent,g_nodeStack.count(),sc->style(),sc->tagName(),FALSE));
-       g_initialStyleStack.push(sc);
-       g_styleStack.pop();
--      sc = g_styleStack.top();
-+      sc = !g_styleStack.isEmpty() ? g_styleStack.top() : 0;
-     }
-   }
- }

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.spec

@@ -1,9 +1,3 @@
-# doxygen is known not to work properly with LTO at this point.  Some of the issues
-# are being worked on upstream and disabling LTO should be re-evaluated as
-# we update this change.  Until such time...
-# Disable LTO
-%global _lto_cflags %{nil}
-
 %if 0%{?fedora}
 %global xapian_core_support ON
 %global clang_support ON
@@ -12,29 +6,49 @@
 %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.9.1
-Release: 9%{?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.doxygen.nl
-Source0: https://doxygen.nl/files/%{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.desktop
 # these icons are part of doxygen and converted from doxywizard.ico
 Source2: doxywizard-icons.tar.xz
 # upstream patches
-Patch1: doxgen-1.9.1-crash-when-parsing-config-file.patch
-Patch2: doxgen-1.9.1-crash-when-parsing-config-file-part2.patch
-Patch3: doxygen-1.9.1-Coverity_issues.patch
-Patch4: doxygen-1.9.1-crash_in_docparser.patch
+Patch0: doxygen-obsolete-egrep.patch
 
 BuildRequires: %{_bindir}/python3
 BuildRequires: gcc-c++ gcc
-BuildRequires: perl-interpreter
+BuildRequires: perl-interpreter, perl-open
+BuildRequires: texlive-bibtex
+
 %if ! 0%{?_module_build}
 BuildRequires: tex(dvips)
 BuildRequires: tex(latex)
@@ -98,16 +112,14 @@ 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
-BuildRequires: zlib-devel
 %endif
 %if "x%{?clang_support}" == "xON"
 BuildRequires: llvm-devel
@@ -138,6 +150,7 @@ 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)
@@ -208,7 +221,11 @@ Requires: texlive-epstopdf
 
 
 %prep
+%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
@@ -304,6 +321,69 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %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)
 

sources

@@ -1,2 +1,2 @@
 SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
-SHA512 (doxygen-1.9.1.src.tar.gz) = 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
+SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2