From 94a0e2dcaa48c351c8d6abf2cbe58f14e6f5b404 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 26 May 2021 21:13:51 +0000 Subject: [PATCH 01/56] Rebuild for LLVM 12.0.0-final --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index 83d30bb..86c1221 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -16,7 +16,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.9.1 -Release: 9%{?dist} +Release: 10%{?dist} # No version is specified. License: GPL+ @@ -304,6 +304,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Wed May 26 2021 Tom Stellard - 1:1.9.1-10 +- Rebuild for LLVM 12.0.0-final + * Tue Mar 30 2021 Jonathan Wakely - 1:1.9.1-9 - Rebuilt for removed libstdc++ symbol (#1937698) From 73aaa730f4add937fa71c3c0411d2ba7d8efa2fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 21:05:29 +0000 Subject: [PATCH 02/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index 83d30bb..8b6ba74 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -16,7 +16,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.9.1 -Release: 9%{?dist} +Release: 10%{?dist} # No version is specified. License: GPL+ @@ -304,6 +304,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1:1.9.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 30 2021 Jonathan Wakely - 1:1.9.1-9 - Rebuilt for removed libstdc++ symbol (#1937698) From 5f8d9f78000b37a888b7becceda46e63038fcac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 17 Aug 2021 19:33:09 +0200 Subject: [PATCH 03/56] Rebuild for clang-13.0.0 --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index 8b6ba74..5cc8033 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -16,7 +16,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.9.1 -Release: 10%{?dist} +Release: 11%{?dist} # No version is specified. License: GPL+ @@ -304,6 +304,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Tue Aug 17 2021 Björn Esser - 1:1.9.1-11 +- Rebuild for clang-13.0.0 + * Wed Jul 21 2021 Fedora Release Engineering - 1:1.9.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 79be305ff0256124b600ecbce47ab10fe59595f4 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 19 Aug 2021 13:06:43 +0200 Subject: [PATCH 04/56] rebase to 1.9.2 --- .gitignore | 1 + ...crash-when-parsing-config-file-part2.patch | 22 ------- ...1.9.1-crash-when-parsing-config-file.patch | 64 ------------------- doxygen-1.9.1-Coverity_issues.patch | 49 -------------- doxygen-1.9.1-crash_in_docparser.patch | 12 ---- doxygen.spec | 17 ++--- sources | 2 +- 7 files changed, 7 insertions(+), 160 deletions(-) delete mode 100644 doxgen-1.9.1-crash-when-parsing-config-file-part2.patch delete mode 100644 doxgen-1.9.1-crash-when-parsing-config-file.patch delete mode 100644 doxygen-1.9.1-Coverity_issues.patch delete mode 100644 doxygen-1.9.1-crash_in_docparser.patch diff --git a/.gitignore b/.gitignore index 8769b24..20cf28b 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ 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 diff --git a/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch b/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch deleted file mode 100644 index 38465ff..0000000 --- a/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch +++ /dev/null @@ -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 diff --git a/doxgen-1.9.1-crash-when-parsing-config-file.patch b/doxgen-1.9.1-crash-when-parsing-config-file.patch deleted file mode 100644 index 848750d..0000000 --- a/doxgen-1.9.1-crash-when-parsing-config-file.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 3b15963316b59cd1af3468a43535d90343916ffb -Author: Dimitri van Heesch -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 - { diff --git a/doxygen-1.9.1-Coverity_issues.patch b/doxygen-1.9.1-Coverity_issues.patch deleted file mode 100644 index a1848e6..0000000 --- a/doxygen-1.9.1-Coverity_issues.patch +++ /dev/null @@ -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 << "\""; diff --git a/doxygen-1.9.1-crash_in_docparser.patch b/doxygen-1.9.1-crash_in_docparser.patch deleted file mode 100644 index adcd144..0000000 --- a/doxygen-1.9.1-crash_in_docparser.patch +++ /dev/null @@ -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; - } - } - } diff --git a/doxygen.spec b/doxygen.spec index 5cc8033..b110ce4 100644 --- a/doxygen.spec +++ b/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 @@ -15,8 +9,8 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 -Version: 1.9.1 -Release: 11%{?dist} +Version: 1.9.2 +Release: 1%{?dist} # No version is specified. License: GPL+ @@ -27,10 +21,6 @@ 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 BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -304,6 +294,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Aug 19 2021 Than Ngo - 1:1.9.2-1 +- rebase to 1.9.2 + * Tue Aug 17 2021 Björn Esser - 1:1.9.1-11 - Rebuild for clang-13.0.0 diff --git a/sources b/sources index 33c38ae..50eecc6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.1.src.tar.gz) = 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed +SHA512 (doxygen-1.9.2.src.tar.gz) = 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0 From 5671b82de32b5e12b78b8f420196fda5a7272750 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 13 Sep 2021 16:43:50 +0200 Subject: [PATCH 05/56] Use predictable and reproducible filenames (rhbz#2000138) --- doxygen.spec | 6 +- predictable-and-reproducible-filenames.patch | 112 +++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 predictable-and-reproducible-filenames.patch diff --git a/doxygen.spec b/doxygen.spec index b110ce4..e6fe5a7 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -10,7 +10,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} # No version is specified. License: GPL+ @@ -21,6 +21,7 @@ Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz # upstream patches +Patch0: predictable-and-reproducible-filenames.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -294,6 +295,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Sun Sep 12 2021 Mattias Ellert - 1:1.9.2-2 +- Use predictable and reproducible filenames (rhbz#2000138) + * Thu Aug 19 2021 Than Ngo - 1:1.9.2-1 - rebase to 1.9.2 diff --git a/predictable-and-reproducible-filenames.patch b/predictable-and-reproducible-filenames.patch new file mode 100644 index 0000000..6a160d8 --- /dev/null +++ b/predictable-and-reproducible-filenames.patch @@ -0,0 +1,112 @@ +diff -ur doxygen-1.9.2.orig/src/dirdef.cpp doxygen-1.9.2/src/dirdef.cpp +--- doxygen-1.9.2.orig/src/dirdef.cpp 2021-08-17 19:10:43.000000000 +0200 ++++ doxygen-1.9.2/src/dirdef.cpp 2021-09-12 21:25:51.878853938 +0200 +@@ -47,7 +47,7 @@ + virtual bool isLinkableInProject() const; + virtual bool isLinkable() const; + virtual QCString displayName(bool=TRUE) const { return m_dispName; } +- virtual const QCString &shortName() const { return m_shortName; } ++ virtual const QCString shortName() const { return m_shortName; } + virtual void addSubDir(DirDef *subdir); + virtual const FileList &getFiles() const { return m_fileList; } + virtual void addFile(const FileDef *fd); +@@ -66,6 +66,7 @@ + virtual void setDiskName(const QCString &name) { m_diskName = name; } + virtual void sort(); + virtual void setParent(DirDef *parent); ++ virtual void setDirCount(int count); + virtual void setLevel(); + virtual void addUsesDependency(const DirDef *usedDir,const FileDef *srcFd, + const FileDef *dstFd,bool inherited); +@@ -92,7 +93,7 @@ + QCString m_shortName; + QCString m_diskName; + FileList m_fileList; // list of files in the group +- int m_dirCount; ++ int m_dirCount = -1; + int m_level; + DirDef *m_parent; + UsedDirLinkedMap m_usedDirs; +@@ -107,8 +108,6 @@ + //---------------------------------------------------------------------- + // method implementation + +-static int g_dirCount=0; +- + DirDefImpl::DirDefImpl(const QCString &path) : DefinitionMixin(path,1,1,path) + { + bool fullPathNames = Config_getBool(FULL_PATH_NAMES); +@@ -132,7 +131,6 @@ + m_dispName = m_dispName.left(m_dispName.length()-1); + } + +- m_dirCount = g_dirCount++; + m_level=-1; + m_parent=0; + } +@@ -163,6 +161,11 @@ + m_parent=p; + } + ++void DirDefImpl::setDirCount(int count) ++{ ++ m_dirCount=count; ++} ++ + void DirDefImpl::addFile(const FileDef *fd) + { + m_fileList.push_back(fd); +@@ -993,7 +996,6 @@ + { + for (const auto &fd : *fn) + { +- //printf("buildDirectories %s\n",qPrint(fd->name())); + if (fd->getReference().isEmpty()) + { + DirDef *dir; +@@ -1038,7 +1040,24 @@ + std::sort(Doxygen::dirLinkedMap->begin(), + Doxygen::dirLinkedMap->end(), + [](const auto &d1,const auto &d2) +- { return qstricmp(d1->shortName(),d2->shortName()) < 0; }); ++ { ++ QCString s1 = d1->shortName(), s2 = d2->shortName(); ++ int i = qstricmp(s1,s2); ++ if (i==0) // if sort name are equal, sort on full path ++ { ++ QCString n1 = d1->name(), n2 = d2->name(); ++ int n = qstricmp(n1,n2); ++ return n < 0; ++ } ++ return i < 0; ++ }); ++ ++ // set the directory count identifier ++ int dirCount=0; ++ for (const auto &dir : *Doxygen::dirLinkedMap) ++ { ++ dir->setDirCount(dirCount++); ++ } + + computeCommonDirPrefix(); + } +diff -ur doxygen-1.9.2.orig/src/dirdef.h doxygen-1.9.2/src/dirdef.h +--- doxygen-1.9.2.orig/src/dirdef.h 2021-05-12 20:51:20.000000000 +0200 ++++ doxygen-1.9.2/src/dirdef.h 2021-09-12 21:25:42.394830066 +0200 +@@ -95,7 +95,7 @@ + virtual bool isLinkableInProject() const = 0; + virtual bool isLinkable() const = 0; + virtual QCString displayName(bool=TRUE) const = 0; +- virtual const QCString &shortName() const = 0; ++ virtual const QCString shortName() const = 0; + virtual void addSubDir(DirDef *subdir) = 0; + virtual const FileList &getFiles() const = 0; + virtual void addFile(const FileDef *fd) = 0; +@@ -115,6 +115,7 @@ + virtual void writeTagFile(TextStream &t) = 0; + + virtual void setDiskName(const QCString &name) = 0; ++ virtual void setDirCount(int count) = 0; + virtual void sort() = 0; + virtual void setParent(DirDef *parent) = 0; + virtual void setLevel() = 0; From 31148b20478d86e8d80ab4e5cd32029b5b982008 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Oct 2021 23:28:03 +0000 Subject: [PATCH 06/56] Rebuild for llvm-13.0.0 --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index e6fe5a7..267ced4 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -10,7 +10,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.9.2 -Release: 2%{?dist} +Release: 3%{?dist} # No version is specified. License: GPL+ @@ -295,6 +295,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Oct 07 2021 Tom Stellard - 1:1.9.2-3 +- Rebuild for llvm-13.0.0 + * Sun Sep 12 2021 Mattias Ellert - 1:1.9.2-2 - Use predictable and reproducible filenames (rhbz#2000138) From 4095f4066e26bdbfcfa24a2b632034d79ed2eee1 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 27 Oct 2021 10:36:59 +0200 Subject: [PATCH 07/56] update --- .gitignore | 1 + doxygen.spec | 9 +- predictable-and-reproducible-filenames.patch | 112 ------------------- sources | 2 +- 4 files changed, 8 insertions(+), 116 deletions(-) delete mode 100644 predictable-and-reproducible-filenames.patch diff --git a/.gitignore b/.gitignore index 20cf28b..c02508c 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ doxygen-1.7.1.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 diff --git a/doxygen.spec b/doxygen.spec index 267ced4..90d8f4b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -10,18 +10,18 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 Version: 1.9.2 -Release: 3%{?dist} +Release: 4%{?dist} # No version is specified. License: GPL+ Url: http://www.doxygen.nl -Source0: https://doxygen.nl/files/%{name}-%{version}.src.tar.gz +Source0: https://doxygen.nl/files/%{name}-%{version}-d882240f-git.src.tar.gz +#Source0: https://doxygen.nl/files/%{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 # upstream patches -Patch0: predictable-and-reproducible-filenames.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -295,6 +295,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Wed Oct 27 2021 Than Ngo - 1:1.9.2-4 +- update + * Thu Oct 07 2021 Tom Stellard - 1:1.9.2-3 - Rebuild for llvm-13.0.0 diff --git a/predictable-and-reproducible-filenames.patch b/predictable-and-reproducible-filenames.patch deleted file mode 100644 index 6a160d8..0000000 --- a/predictable-and-reproducible-filenames.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -ur doxygen-1.9.2.orig/src/dirdef.cpp doxygen-1.9.2/src/dirdef.cpp ---- doxygen-1.9.2.orig/src/dirdef.cpp 2021-08-17 19:10:43.000000000 +0200 -+++ doxygen-1.9.2/src/dirdef.cpp 2021-09-12 21:25:51.878853938 +0200 -@@ -47,7 +47,7 @@ - virtual bool isLinkableInProject() const; - virtual bool isLinkable() const; - virtual QCString displayName(bool=TRUE) const { return m_dispName; } -- virtual const QCString &shortName() const { return m_shortName; } -+ virtual const QCString shortName() const { return m_shortName; } - virtual void addSubDir(DirDef *subdir); - virtual const FileList &getFiles() const { return m_fileList; } - virtual void addFile(const FileDef *fd); -@@ -66,6 +66,7 @@ - virtual void setDiskName(const QCString &name) { m_diskName = name; } - virtual void sort(); - virtual void setParent(DirDef *parent); -+ virtual void setDirCount(int count); - virtual void setLevel(); - virtual void addUsesDependency(const DirDef *usedDir,const FileDef *srcFd, - const FileDef *dstFd,bool inherited); -@@ -92,7 +93,7 @@ - QCString m_shortName; - QCString m_diskName; - FileList m_fileList; // list of files in the group -- int m_dirCount; -+ int m_dirCount = -1; - int m_level; - DirDef *m_parent; - UsedDirLinkedMap m_usedDirs; -@@ -107,8 +108,6 @@ - //---------------------------------------------------------------------- - // method implementation - --static int g_dirCount=0; -- - DirDefImpl::DirDefImpl(const QCString &path) : DefinitionMixin(path,1,1,path) - { - bool fullPathNames = Config_getBool(FULL_PATH_NAMES); -@@ -132,7 +131,6 @@ - m_dispName = m_dispName.left(m_dispName.length()-1); - } - -- m_dirCount = g_dirCount++; - m_level=-1; - m_parent=0; - } -@@ -163,6 +161,11 @@ - m_parent=p; - } - -+void DirDefImpl::setDirCount(int count) -+{ -+ m_dirCount=count; -+} -+ - void DirDefImpl::addFile(const FileDef *fd) - { - m_fileList.push_back(fd); -@@ -993,7 +996,6 @@ - { - for (const auto &fd : *fn) - { -- //printf("buildDirectories %s\n",qPrint(fd->name())); - if (fd->getReference().isEmpty()) - { - DirDef *dir; -@@ -1038,7 +1040,24 @@ - std::sort(Doxygen::dirLinkedMap->begin(), - Doxygen::dirLinkedMap->end(), - [](const auto &d1,const auto &d2) -- { return qstricmp(d1->shortName(),d2->shortName()) < 0; }); -+ { -+ QCString s1 = d1->shortName(), s2 = d2->shortName(); -+ int i = qstricmp(s1,s2); -+ if (i==0) // if sort name are equal, sort on full path -+ { -+ QCString n1 = d1->name(), n2 = d2->name(); -+ int n = qstricmp(n1,n2); -+ return n < 0; -+ } -+ return i < 0; -+ }); -+ -+ // set the directory count identifier -+ int dirCount=0; -+ for (const auto &dir : *Doxygen::dirLinkedMap) -+ { -+ dir->setDirCount(dirCount++); -+ } - - computeCommonDirPrefix(); - } -diff -ur doxygen-1.9.2.orig/src/dirdef.h doxygen-1.9.2/src/dirdef.h ---- doxygen-1.9.2.orig/src/dirdef.h 2021-05-12 20:51:20.000000000 +0200 -+++ doxygen-1.9.2/src/dirdef.h 2021-09-12 21:25:42.394830066 +0200 -@@ -95,7 +95,7 @@ - virtual bool isLinkableInProject() const = 0; - virtual bool isLinkable() const = 0; - virtual QCString displayName(bool=TRUE) const = 0; -- virtual const QCString &shortName() const = 0; -+ virtual const QCString shortName() const = 0; - virtual void addSubDir(DirDef *subdir) = 0; - virtual const FileList &getFiles() const = 0; - virtual void addFile(const FileDef *fd) = 0; -@@ -115,6 +115,7 @@ - virtual void writeTagFile(TextStream &t) = 0; - - virtual void setDiskName(const QCString &name) = 0; -+ virtual void setDirCount(int count) = 0; - virtual void sort() = 0; - virtual void setParent(DirDef *parent) = 0; - virtual void setLevel() = 0; diff --git a/sources b/sources index 50eecc6..cce33e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.2.src.tar.gz) = 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0 +SHA512 (doxygen-1.9.2-d882240f-git.src.tar.gz) = 3e32f11b0dd0078f1edad2182a348514b3e68bb66eb256c1b89f297777afd60c7fd40c46d03d3de69acd3b87e04b6a9bfa2edc09d516f1f9bfb31b63093d134e From 195466f02eb02b595465d9176d419f28b57aee98 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 27 Oct 2021 12:28:12 +0200 Subject: [PATCH 08/56] revert 1.9.1, noarch package built differently on different architectures --- ...crash-when-parsing-config-file-part2.patch | 22 +++++++ ...1.9.1-crash-when-parsing-config-file.patch | 64 +++++++++++++++++++ doxygen-1.9.1-Coverity_issues.patch | 49 ++++++++++++++ doxygen-1.9.1-crash_in_docparser.patch | 12 ++++ doxygen.spec | 16 +++-- sources | 2 +- 6 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 doxgen-1.9.1-crash-when-parsing-config-file-part2.patch create mode 100644 doxgen-1.9.1-crash-when-parsing-config-file.patch create mode 100644 doxygen-1.9.1-Coverity_issues.patch create mode 100644 doxygen-1.9.1-crash_in_docparser.patch diff --git a/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch b/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch new file mode 100644 index 0000000..38465ff --- /dev/null +++ b/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch @@ -0,0 +1,22 @@ +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 diff --git a/doxgen-1.9.1-crash-when-parsing-config-file.patch b/doxgen-1.9.1-crash-when-parsing-config-file.patch new file mode 100644 index 0000000..848750d --- /dev/null +++ b/doxgen-1.9.1-crash-when-parsing-config-file.patch @@ -0,0 +1,64 @@ +commit 3b15963316b59cd1af3468a43535d90343916ffb +Author: Dimitri van Heesch +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 + { diff --git a/doxygen-1.9.1-Coverity_issues.patch b/doxygen-1.9.1-Coverity_issues.patch new file mode 100644 index 0000000..a1848e6 --- /dev/null +++ b/doxygen-1.9.1-Coverity_issues.patch @@ -0,0 +1,49 @@ +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 << "\""; diff --git a/doxygen-1.9.1-crash_in_docparser.patch b/doxygen-1.9.1-crash_in_docparser.patch new file mode 100644 index 0000000..adcd144 --- /dev/null +++ b/doxygen-1.9.1-crash_in_docparser.patch @@ -0,0 +1,12 @@ +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; + } + } + } diff --git a/doxygen.spec b/doxygen.spec index 90d8f4b..9dd445c 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -8,20 +8,23 @@ Summary: A documentation system for C/C++ Name: doxygen -Epoch: 1 -Version: 1.9.2 -Release: 4%{?dist} +Epoch: 2 +Version: 1.9.1 +Release: 12%{?dist} # No version is specified. License: GPL+ Url: http://www.doxygen.nl -Source0: https://doxygen.nl/files/%{name}-%{version}-d882240f-git.src.tar.gz -#Source0: https://doxygen.nl/files/%{name}-%{version}.src.tar.gz +Source0: https://doxygen.nl/files/%{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 # 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 BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -295,6 +298,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Wed Oct 27 2021 Than Ngo - 2:1.9.1-12 +- revert 1.9.1, noarch package built differently on different architectures + * Wed Oct 27 2021 Than Ngo - 1:1.9.2-4 - update diff --git a/sources b/sources index cce33e9..33c38ae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.2-d882240f-git.src.tar.gz) = 3e32f11b0dd0078f1edad2182a348514b3e68bb66eb256c1b89f297777afd60c7fd40c46d03d3de69acd3b87e04b6a9bfa2edc09d516f1f9bfb31b63093d134e +SHA512 (doxygen-1.9.1.src.tar.gz) = 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed From fef22c40eab2650f8af032fc578e9a2b4296801e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:59:37 +0000 Subject: [PATCH 09/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index 9dd445c..fd087af 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -10,7 +10,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 Version: 1.9.1 -Release: 12%{?dist} +Release: 13%{?dist} # No version is specified. License: GPL+ @@ -298,6 +298,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2:1.9.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Oct 27 2021 Than Ngo - 2:1.9.1-12 - revert 1.9.1, noarch package built differently on different architectures From afb87de38ecba7617ca15ae33a6af148ba3d1b1b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 17 Feb 2022 14:56:28 +0100 Subject: [PATCH 10/56] update to 1.9.4 snapshot --- .gitignore | 1 + ...crash-when-parsing-config-file-part2.patch | 22 ------- ...1.9.1-crash-when-parsing-config-file.patch | 64 ------------------- doxygen-1.9.1-Coverity_issues.patch | 49 -------------- doxygen-1.9.1-crash_in_docparser.patch | 12 ---- doxygen.spec | 26 +++++++- sources | 2 +- 7 files changed, 26 insertions(+), 150 deletions(-) delete mode 100644 doxgen-1.9.1-crash-when-parsing-config-file-part2.patch delete mode 100644 doxgen-1.9.1-crash-when-parsing-config-file.patch delete mode 100644 doxygen-1.9.1-Coverity_issues.patch delete mode 100644 doxygen-1.9.1-crash_in_docparser.patch diff --git a/.gitignore b/.gitignore index c02508c..74ddfbb 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ doxygen-1.7.1.src.tar.gz /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 diff --git a/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch b/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch deleted file mode 100644 index 38465ff..0000000 --- a/doxgen-1.9.1-crash-when-parsing-config-file-part2.patch +++ /dev/null @@ -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 diff --git a/doxgen-1.9.1-crash-when-parsing-config-file.patch b/doxgen-1.9.1-crash-when-parsing-config-file.patch deleted file mode 100644 index 848750d..0000000 --- a/doxgen-1.9.1-crash-when-parsing-config-file.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 3b15963316b59cd1af3468a43535d90343916ffb -Author: Dimitri van Heesch -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 - { diff --git a/doxygen-1.9.1-Coverity_issues.patch b/doxygen-1.9.1-Coverity_issues.patch deleted file mode 100644 index a1848e6..0000000 --- a/doxygen-1.9.1-Coverity_issues.patch +++ /dev/null @@ -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 << "\""; diff --git a/doxygen-1.9.1-crash_in_docparser.patch b/doxygen-1.9.1-crash_in_docparser.patch deleted file mode 100644 index adcd144..0000000 --- a/doxygen-1.9.1-crash_in_docparser.patch +++ /dev/null @@ -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; - } - } - } diff --git a/doxygen.spec b/doxygen.spec index fd087af..e7db7ce 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -6,16 +6,31 @@ %global clang_support OFF %endif +%global stable 0 + +%if 0%{?stable} +%global irelease 1 +%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.1 -Release: 13%{?dist} +Version: 1.9.4 +Release: %{irelease}%{?dist} # No version is specified. License: GPL+ Url: http://www.doxygen.nl +%if 0%{?stable} Source0: https://doxygen.nl/files/%{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 @@ -202,7 +217,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 @@ -298,6 +317,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Feb 17 2022 Than Ngo - 2:1.9.4-0.20220217gite18f715e +- update to 1.9.4 snapshot + * Thu Jan 20 2022 Fedora Release Engineering - 2:1.9.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 33c38ae..c0431d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.1.src.tar.gz) = 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed +SHA512 (doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz) = 312b9c77444c9b81f5514f83bde113f22a51f83d76b7c7b426ed18a461c929d088cb1717c779c5c08cc0939b50a2f00dfe61754ee1a4dee3a69f70aedcef2043 From da0ebbca9fe9fd21992e068e004fa90c0fb82f22 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 17 Feb 2022 17:28:40 +0100 Subject: [PATCH 11/56] dropped obsoletes patches --- doxygen.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doxygen.spec b/doxygen.spec index e7db7ce..65228e3 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -36,10 +36,6 @@ 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 BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc From 225d187031ba30ceb601463638b52cff7a179d29 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 6 May 2022 12:07:09 +0200 Subject: [PATCH 12/56] 1.9.4 release --- .gitignore | 1 + doxygen-1.9.4-gcc12.1.patch | 18 ++++++++++++++++++ doxygen.spec | 10 +++++++--- sources | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 doxygen-1.9.4-gcc12.1.patch diff --git a/.gitignore b/.gitignore index 74ddfbb..2363cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ doxygen-1.7.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 diff --git a/doxygen-1.9.4-gcc12.1.patch b/doxygen-1.9.4-gcc12.1.patch new file mode 100644 index 0000000..e2ca6b8 --- /dev/null +++ b/doxygen-1.9.4-gcc12.1.patch @@ -0,0 +1,18 @@ +commit 5198966c8d5fec89116d025c74934ac03ea511fa +Author: Dimitri van Heesch +Date: Fri May 6 09:55:16 2022 +0200 + + issue #9312: Build: cache.h:53:14: error: 'exchange' is not a member of 'std' + +diff --git a/src/cache.h b/src/cache.h +index 0ff3092e..e218eb27 100644 +--- a/src/cache.h ++++ b/src/cache.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + /*! Fixed size cache for value type V using keys of type K. diff --git a/doxygen.spec b/doxygen.spec index 65228e3..52b274f 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -6,7 +6,7 @@ %global clang_support OFF %endif -%global stable 0 +%global stable 1 %if 0%{?stable} %global irelease 1 @@ -25,9 +25,9 @@ Release: %{irelease}%{?dist} # No version is specified. License: GPL+ -Url: http://www.doxygen.nl +Url: https://github.com/doxygen %if 0%{?stable} -Source0: https://doxygen.nl/files/%{name}-%{version}.src.tar.gz +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 @@ -36,6 +36,7 @@ Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz # upstream patches +Patch0: doxygen-1.9.4-gcc12.1.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -313,6 +314,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri May 06 2022 Than Ngo - 2:1.9.4-1 +- 1.9.4 + * Thu Feb 17 2022 Than Ngo - 2:1.9.4-0.20220217gite18f715e - update to 1.9.4 snapshot diff --git a/sources b/sources index c0431d9..affa651 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz) = 312b9c77444c9b81f5514f83bde113f22a51f83d76b7c7b426ed18a461c929d088cb1717c779c5c08cc0939b50a2f00dfe61754ee1a4dee3a69f70aedcef2043 +SHA512 (doxygen-1.9.4.src.tar.gz) = 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a From cd11c2f98d2b783366da0bc7711b0844e635e5eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:52:32 +0000 Subject: [PATCH 13/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index 52b274f..781c4b8 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -21,7 +21,7 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 Version: 1.9.4 -Release: %{irelease}%{?dist} +Release: %{irelease}%{?dist}.1 # No version is specified. License: GPL+ @@ -314,6 +314,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2:1.9.4-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri May 06 2022 Than Ngo - 2:1.9.4-1 - 1.9.4 From eaf38ac3597016fc5ba1c4c5886bb7c73af41bc9 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 4 Aug 2022 11:41:14 +0200 Subject: [PATCH 14/56] Fixed #2113876, Failed to build LaTex output --- ...typo_in_generated_Makefile_for_LaTex.patch | 19 +++++++++++++++++++ doxygen.spec | 16 +++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch diff --git a/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch b/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch new file mode 100644 index 0000000..99fde06 --- /dev/null +++ b/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch @@ -0,0 +1,19 @@ +commit 6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4 +Author: František Dvořák +Date: Mon Jul 25 21:40:19 2022 +0200 + + Fix typo in generated Makefile for LaTex + +diff --git a/src/latexgen.cpp b/src/latexgen.cpp +index d3ad3bd3..c5f436ce 100644 +--- a/src/latexgen.cpp ++++ b/src/latexgen.cpp +@@ -337,7 +337,7 @@ static void writeLatexMakefile() + } + t << "\techo \"Rerunning latex....\"\n" + << "\t$(LATEX_CMD) $(MANUAL_FILE).tex\n" +- << "\tlatex_count=%(LATEX_COUNT) ; \\\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" + << "\t do \\\n" + << "\t echo \"Rerunning latex....\" ;\\\n" diff --git a/doxygen.spec b/doxygen.spec index 781c4b8..004aa17 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -9,7 +9,7 @@ %global stable 1 %if 0%{?stable} -%global irelease 1 +%global irelease 2 %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -21,8 +21,14 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 Version: 1.9.4 -Release: %{irelease}%{?dist}.1 - +%if 0%{?stable} +Release: 2%{?dist} +%else +%global commit e18f715eb55121a4219d00bc4d824cebf1fb504b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global date 20220217 +Release: 0.%{date}git%{shortcommit} +%endif # No version is specified. License: GPL+ Url: https://github.com/doxygen @@ -37,6 +43,7 @@ Source1: doxywizard.desktop Source2: doxywizard-icons.tar.xz # upstream patches Patch0: doxygen-1.9.4-gcc12.1.patch +Patch1: doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -314,6 +321,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Aug 04 2022 Than Ngo - 2:1.9.4-2 +- Fixed #2113876, Failed to build LaTex output + * Thu Jul 21 2022 Fedora Release Engineering - 2:1.9.4-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8868712c8ff865c7b37a3e25aa7bc467b9f6de86 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 9 Sep 2022 11:01:32 +0200 Subject: [PATCH 15/56] update to 1.9.5 --- .gitignore | 1 + doxygen-1.9.4-gcc12.1.patch | 18 ------------------ ...typo_in_generated_Makefile_for_LaTex.patch | 19 ------------------- doxygen.spec | 9 +++++---- sources | 2 +- 5 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 doxygen-1.9.4-gcc12.1.patch delete mode 100644 doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch diff --git a/.gitignore b/.gitignore index 2363cb3..a966a88 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ doxygen-1.7.1.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 diff --git a/doxygen-1.9.4-gcc12.1.patch b/doxygen-1.9.4-gcc12.1.patch deleted file mode 100644 index e2ca6b8..0000000 --- a/doxygen-1.9.4-gcc12.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 5198966c8d5fec89116d025c74934ac03ea511fa -Author: Dimitri van Heesch -Date: Fri May 6 09:55:16 2022 +0200 - - issue #9312: Build: cache.h:53:14: error: 'exchange' is not a member of 'std' - -diff --git a/src/cache.h b/src/cache.h -index 0ff3092e..e218eb27 100644 ---- a/src/cache.h -+++ b/src/cache.h -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - - /*! Fixed size cache for value type V using keys of type K. diff --git a/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch b/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch deleted file mode 100644 index 99fde06..0000000 --- a/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4 -Author: František Dvořák -Date: Mon Jul 25 21:40:19 2022 +0200 - - Fix typo in generated Makefile for LaTex - -diff --git a/src/latexgen.cpp b/src/latexgen.cpp -index d3ad3bd3..c5f436ce 100644 ---- a/src/latexgen.cpp -+++ b/src/latexgen.cpp -@@ -337,7 +337,7 @@ static void writeLatexMakefile() - } - t << "\techo \"Rerunning latex....\"\n" - << "\t$(LATEX_CMD) $(MANUAL_FILE).tex\n" -- << "\tlatex_count=%(LATEX_COUNT) ; \\\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" - << "\t do \\\n" - << "\t echo \"Rerunning latex....\" ;\\\n" diff --git a/doxygen.spec b/doxygen.spec index 004aa17..6eddba1 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -20,9 +20,9 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 -Version: 1.9.4 +Version: 1.9.5 %if 0%{?stable} -Release: 2%{?dist} +Release: 1%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -42,8 +42,6 @@ Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz # upstream patches -Patch0: doxygen-1.9.4-gcc12.1.patch -Patch1: doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -321,6 +319,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri Sep 09 2022 Than Ngo - 2:1.9.5-1 +- 1.9.5 + * Thu Aug 04 2022 Than Ngo - 2:1.9.4-2 - Fixed #2113876, Failed to build LaTex output diff --git a/sources b/sources index affa651..b94770f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.4.src.tar.gz) = 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a +SHA512 (doxygen-1.9.5.src.tar.gz) = 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651 From 9067a3fa844dca677dbba40d898cb06efaf35aec Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 18 Sep 2022 15:47:06 +0100 Subject: [PATCH 16/56] Rebuild for llvm 15 --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index 6eddba1..50edd22 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.5 %if 0%{?stable} -Release: 1%{?dist} +Release: 2%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -319,6 +319,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Sun Sep 18 2022 Pete Walter - 2:1.9.5-2 +- Rebuild for llvm 15 + * Fri Sep 09 2022 Than Ngo - 2:1.9.5-1 - 1.9.5 From f1d9aad3d51d506f79a89a9c5371a8150fa83956 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 3 Jan 2023 14:54:41 +0100 Subject: [PATCH 17/56] fixed bz#2156564, update to 1.9.6 --- .gitignore | 1 + doxygen.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a966a88..3da1189 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ doxygen-1.7.1.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 diff --git a/doxygen.spec b/doxygen.spec index 50edd22..10bd5be 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -20,9 +20,9 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 -Version: 1.9.5 +Version: 1.9.6 %if 0%{?stable} -Release: 2%{?dist} +Release: 1%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -319,6 +319,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Tue Jan 03 2023 Than Ngo - 2:1.9.6-1 +- fixed bz#2156564, update to 1.9.6 + * Sun Sep 18 2022 Pete Walter - 2:1.9.5-2 - Rebuild for llvm 15 diff --git a/sources b/sources index b94770f..a8ffdb3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.5.src.tar.gz) = 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651 +SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2 From 3f948a6a3b7d42a00763ca79d4206a8a2f3a5386 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 3 Jan 2023 15:05:18 +0100 Subject: [PATCH 18/56] added doxywizard-icons.tar.xz back --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index a8ffdb3..b45c18d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2 From f977bc64794c671a5e87a4fb90a4e9d9cfe0ba11 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 18 Jan 2023 09:51:23 +0100 Subject: [PATCH 19/56] fixed bz#2161515 - doxygen FTBFS if _module_build is 1 --- doxygen.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/doxygen.spec b/doxygen.spec index 10bd5be..37c7653 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 1%{?dist} +Release: 2%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -45,7 +45,9 @@ Source2: doxywizard-icons.tar.xz 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) @@ -109,16 +111,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 @@ -319,6 +319,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Wed Jan 18 2023 Than Ngo - 2:1.9.6-2 +- fixed bz#2161515 - doxygen FTBFS if _module_build is 1 + * Tue Jan 03 2023 Than Ngo - 2:1.9.6-1 - fixed bz#2156564, update to 1.9.6 From 3f85f0ae60e6f5afc67ff8ae770596141b42b97f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:44:56 +0000 Subject: [PATCH 20/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- doxygen.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doxygen.spec b/doxygen.spec index 37c7653..c54faf1 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,12 +22,12 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 2%{?dist} +Release: 3%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global date 20220217 -Release: 0.%{date}git%{shortcommit} +Release: 0.%{date}git%{shortcommit}.1 %endif # No version is specified. License: GPL+ @@ -319,6 +319,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2:1.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Than Ngo - 2:1.9.6-2 - fixed bz#2161515 - doxygen FTBFS if _module_build is 1 From c3bee7741655426c9f9700afcdb839917a6d388b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 20 Jan 2023 09:30:29 +0100 Subject: [PATCH 21/56] fixed bz#2162170, add Require on texlive-wasy --- doxygen.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index c54faf1..f2703b1 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 3%{?dist} +Release: 4%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -149,6 +149,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) @@ -319,6 +320,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri Jan 20 2023 Than Ngo - 2:1.9.6-4 +- fixed bz#2162170, add Require on texlive-wasy + * Thu Jan 19 2023 Fedora Release Engineering - 2:1.9.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6f8058dfe71cae0141497c059404d88198afcd9b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 25 Jan 2023 10:17:17 +0100 Subject: [PATCH 22/56] rebuilt against ghostscript-10 --- doxygen.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doxygen.spec b/doxygen.spec index f2703b1..ae58d21 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 4%{?dist} +Release: 5%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -320,6 +320,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Wed Jan 25 2023 Than Ngo - 2:1.9.6-5 +- rebuilt against new ghostscript-10 + * Fri Jan 20 2023 Than Ngo - 2:1.9.6-4 - fixed bz#2162170, add Require on texlive-wasy From 4c2570a2887983b774404207d6f3b1a2fb25e889 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 17 Feb 2023 09:31:53 +0100 Subject: [PATCH 23/56] migrated to SPDX license --- doxygen.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doxygen.spec b/doxygen.spec index ae58d21..c101895 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 5%{?dist} +Release: 6%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -30,7 +30,7 @@ Release: 5%{?dist} Release: 0.%{date}git%{shortcommit}.1 %endif # No version is specified. -License: GPL+ +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 @@ -320,6 +320,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri Feb 17 2023 Than Ngo - 2:1.9.6-6 +- migrated to SPDX license + * Wed Jan 25 2023 Than Ngo - 2:1.9.6-5 - rebuilt against new ghostscript-10 From cc385e03b004a76ab9042282be2f8f77fa040c6a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 10 Mar 2023 16:59:51 +0100 Subject: [PATCH 24/56] replace obsolescent egrep with grep -E --- doxygen-obsolete-egrep.patch | 40 ++++++++++++++++++++++++++++++++++++ doxygen.spec | 6 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 doxygen-obsolete-egrep.patch diff --git a/doxygen-obsolete-egrep.patch b/doxygen-obsolete-egrep.patch new file mode 100644 index 0000000..9a859b5 --- /dev/null +++ b/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" diff --git a/doxygen.spec b/doxygen.spec index c101895..6009311 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -22,7 +22,7 @@ Name: doxygen Epoch: 2 Version: 1.9.6 %if 0%{?stable} -Release: 6%{?dist} +Release: 7%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -42,6 +42,7 @@ Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz # upstream patches +Patch0: doxygen-obsolete-egrep.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -320,6 +321,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri Mar 10 2023 Than Ngo - 2:1.9.6-7 +- replace obsolescent egrep with grep -E + * Fri Feb 17 2023 Than Ngo - 2:1.9.6-6 - migrated to SPDX license From 1c010746353849a0e6794685dab63a494992609b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 19 May 2023 15:55:46 +0200 Subject: [PATCH 25/56] fix #2208417, rebase to 1.9.7 --- doxygen-obsolete-egrep.patch | 40 ------------------------------------ doxygen.spec | 11 +++++++--- 2 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 doxygen-obsolete-egrep.patch diff --git a/doxygen-obsolete-egrep.patch b/doxygen-obsolete-egrep.patch deleted file mode 100644 index 9a859b5..0000000 --- a/doxygen-obsolete-egrep.patch +++ /dev/null @@ -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" diff --git a/doxygen.spec b/doxygen.spec index 6009311..08b338c 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -20,9 +20,9 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 2 -Version: 1.9.6 +Version: 1.9.7 %if 0%{?stable} -Release: 7%{?dist} +Release: 1%{?dist} %else %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -41,8 +41,8 @@ Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{commit}. Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz + # upstream patches -Patch0: doxygen-obsolete-egrep.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -232,6 +232,8 @@ iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO +# disable unicode test temporary +rm -rf testing/061* %build %if ! 0%{?_module_build} @@ -321,6 +323,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri May 19 2023 Than Ngo - 2:1.9.7-1 +- fix #2208417, rebase to 1.9.7 + * Fri Mar 10 2023 Than Ngo - 2:1.9.6-7 - replace obsolescent egrep with grep -E From 7382a0f9f761d8171600e7e2ded232f2bf78761b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 19 May 2023 16:04:56 +0200 Subject: [PATCH 26/56] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3da1189..0d9d63e 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ doxygen-1.7.1.src.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.9.7.src.tar.gz diff --git a/sources b/sources index b45c18d..590824a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2 +SHA512 (doxygen-1.9.7.src.tar.gz) = 618ff58aa6f0a2eb89f95b570995ea3ebbcda64f502cabcecd9be2967abffb56d0d6747de0c06df422705919757e6af9c6e5a56ca603b1ddf7a09a7ee79b1803 From 2e8846fbc2b63d5a1c6fb01dbe118a135795f6eb Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 30 May 2023 13:58:04 +0200 Subject: [PATCH 27/56] - disable build_wizard for eln - fixed broken unicode test --- doxygen-1.9.7-unicode-test.ptch | 34 ++++++++++++++++ doxygen.spec | 69 ++++++++++++--------------------- 2 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 doxygen-1.9.7-unicode-test.ptch diff --git a/doxygen-1.9.7-unicode-test.ptch b/doxygen-1.9.7-unicode-test.ptch new file mode 100644 index 0000000..1d390b8 --- /dev/null +++ b/doxygen-1.9.7-unicode-test.ptch @@ -0,0 +1,34 @@ +diff -Nur doxygen-1.9.7-bug/doc_internal/releases.md doxygen-1.9.7/doc_internal/releases.md +--- doxygen-1.9.7-bug/doc_internal/releases.md 2023-05-18 20:19:49.000000000 +0200 ++++ doxygen-1.9.7/doc_internal/releases.md 2023-05-18 21:16:40.000000000 +0200 +@@ -2,7 +2,7 @@ + + The following table gives an overview of the doxygen releases with together with the release dates. +