From 1c010746353849a0e6794685dab63a494992609b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 19 May 2023 15:55:46 +0200 Subject: [PATCH 01/32] 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 02/32] 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 03/32] - 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. +