diff --git a/RTFGenerator-should-exit-with-0-when-gengrate-file-s.patch b/RTFGenerator-should-exit-with-0-when-gengrate-file-s.patch deleted file mode 100644 index 15c952ce39811a15595fed9066226683e1cdb958..0000000000000000000000000000000000000000 --- a/RTFGenerator-should-exit-with-0-when-gengrate-file-s.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c23a12be8a23b9de7f6e78236cf1b571213cb5f9 Mon Sep 17 00:00:00 2001 -From: si-gui -Date: Mon, 12 Apr 2021 16:42:28 +0800 -Subject: [PATCH] RTFGenerator should exit with 0 when gengrate file success - ---- - src/doxygen.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/doxygen.cpp b/src/doxygen.cpp -index 6163e81..31f6886 100644 ---- a/src/doxygen.cpp -+++ b/src/doxygen.cpp -@@ -9974,7 +9974,7 @@ void readConfiguration(int argc, char **argv) - RTFGenerator::writeStyleSheetFile(t); - } - cleanUpDoxygen(); -- exit(1); -+ exit(0); - } - else if (qstricmp(formatName.data(),"html")==0) - { --- -2.30.0 - diff --git a/doxygen-1.9.2.src.tar.gz b/doxygen-1.9.3.src.tar.gz similarity index 40% rename from doxygen-1.9.2.src.tar.gz rename to doxygen-1.9.3.src.tar.gz index a5ccb5e6260632054f17e26bfec6951091e3aa4d..27a4c7a6ce97d7c12c20eb1f7fdc7763a2a7eb57 100644 Binary files a/doxygen-1.9.2.src.tar.gz and b/doxygen-1.9.3.src.tar.gz differ diff --git a/doxygen-modify_footer.patch b/doxygen-modify_footer.patch new file mode 100644 index 0000000000000000000000000000000000000000..1e0632c47bd5a293b3b1029d798172e63ecaa1ad --- /dev/null +++ b/doxygen-modify_footer.patch @@ -0,0 +1,13 @@ +Index: doxygen-1.8.16/Doxyfile +=================================================================== +--- doxygen-1.8.16.orig/Doxyfile 2019-09-30 09:31:11.324583274 +0200 ++++ doxygen-1.8.16/Doxyfile 2019-09-30 09:31:20.108631879 +0200 +@@ -158,7 +158,7 @@ HTML_EXTRA_FILES = + HTML_COLORSTYLE_HUE = 220 + HTML_COLORSTYLE_SAT = 100 + HTML_COLORSTYLE_GAMMA = 80 +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + HTML_DYNAMIC_MENUS = YES + HTML_DYNAMIC_SECTIONS = YES + HTML_INDEX_NUM_ENTRIES = 100 diff --git a/doxygen-no-libclang-cpp.patch b/doxygen-no-libclang-cpp.patch new file mode 100644 index 0000000000000000000000000000000000000000..c1b98ce6e400fa2d3928ba25aae53cac6ee3b42e --- /dev/null +++ b/doxygen-no-libclang-cpp.patch @@ -0,0 +1,11 @@ +--- doxygen-1.8.20/src/CMakeLists.txt.orig 2020-10-06 15:56:02.841527965 +0200 ++++ doxygen-1.8.20/src/CMakeLists.txt 2020-10-06 16:07:14.226206979 +0200 +@@ -341,7 +341,7 @@ + set(CLANG_LIBS libclang clangTooling) + else() # dynamically linked version of clang + llvm_config(doxymain USE_SHARED support) +- set(CLANG_LIBS libclang clang-cpp) ++ set(CLANG_LIBS libclang clangTooling) + endif() + target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) + endif() diff --git a/doxygen-no-lowercase-man-names.patch b/doxygen-no-lowercase-man-names.patch new file mode 100644 index 0000000000000000000000000000000000000000..e0719e987866555f7e8a1f5f9bc1d0a6871f7438 --- /dev/null +++ b/doxygen-no-lowercase-man-names.patch @@ -0,0 +1,12 @@ +Index: doxygen-1.9.2/src/fortranscanner.l +=================================================================== +--- doxygen-1.9.2.orig/src/fortranscanner.l ++++ doxygen-1.9.2/src/fortranscanner.l +@@ -2314,7 +2314,6 @@ static void initEntry(yyscan_t yyscanner + static void addCurrentEntry(yyscan_t yyscanner,bool case_insens) + { + struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; +- if (case_insens) yyextra->current->name = yyextra->current->name.lower(); + //printf("===Adding entry %s to %s\n", qPrint(yyextra->current->name), qPrint(yyextra->current_root->name)); + yyextra->last_entry = yyextra->current; + yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current); diff --git a/doxygen.spec b/doxygen.spec index fbba8ffffe9e3c8fcb2a25338ed603ceb666cd50..9417bd7c6dab4c9cf0605578076f3fa216455743 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,26 +1,34 @@ %global xapian_core_support "ON" %global BuildDir "Out" +%global clang_support ON Name: doxygen Epoch: 1 -Version: 1.9.2 -Release: 2 +Version: 1.9.3 +Release: 1 Summary: A documentation system for C/C++ License: GPL+ -Url: http://www.doxygen.nl -Source0: https://nchc.dl.sourceforge.net/project/%{name}/rel-%{version}/%{name}-%{version}.src.tar.gz +Url: https://www.doxygen.nl +Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz Source1: doxywizard.desktop - -Patch0: RTFGenerator-should-exit-with-0-when-gengrate-file-s.patch +Source2: doxywizard-icons.tar.xz +Patch0: %{name}-modify_footer.patch +Patch1: %{name}-no-lowercase-man-names.patch +Patch10: doxygen-no-libclang-cpp.patch BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter -BuildRequires: tex(dvips) tex(latex) tex(multirow.sty) tex(sectsty.sty) tex(tocloft.sty) -BuildRequires: tex(xtab.sty) tex(import.sty) tex(tabu.sty) tex(appendix.sty) -BuildRequires: tex(adjustbox.sty) /usr/bin/epstopdf texlive-epstopdf ghostscript gettext -BuildRequires: desktop-file-utils graphviz flex bison cmake git +BuildRequires: python3-libxml2 texlive-bibtex +BuildRequires: desktop-file-utils graphviz flex bison cmake %if %{xapian_core_support} == "ON" BuildRequires: xapian-core-devel zlib-devel %endif +%if "x%{?clang_support}" == "xON" +BuildRequires: llvm-devel +BuildRequires: clang-devel +%endif + Requires: perl-interpreter +Requires: graphviz + %description Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming @@ -46,7 +54,6 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO install -d %{BuildDir} cd %{BuildDir} %cmake \ - -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -Dbuild_doc=OFF \ -Dbuild_wizard=ON \ -Dbuild_xmlparser=ON \ @@ -54,6 +61,7 @@ cd %{BuildDir} -DMAN_INSTALL_DIR=%{_mandir}/man1 \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ + -Duse_libclang=%{clang_support} \ .. cd - %make_build -C %{BuildDir} @@ -95,6 +103,9 @@ make tests -C %{BuildDir} %{_datadir}/icons/hicolor/*/apps/doxywizard.png %changelog +* Mon Apr 11 2022 lin zhang - 1:1.9.3-1 +- Update to 1.9.3-1 + * Tue Mar 29 2022 baizhonggui - 1.9.2-2 - Fix build error for string compare diff --git a/doxywizard-icons.tar.xz b/doxywizard-icons.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..1ae67c77a79bf986817fbd830f0673dc20496d4a Binary files /dev/null and b/doxywizard-icons.tar.xz differ