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 2e6f47a780b2223ef8234b056c42f15d1d4e4e6a..59ac0b1eeb15ea9a4a2636bd534d6c6c76cb57a8 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,26 +1,35 @@ -%global xapian_core_support OFF -%global BuildDir Out +%global xapian_core_support "ON" +%global BuildDir "Out" +%global clang_support OFF Name: doxygen Epoch: 1 -Version: 1.9.2 -Release: 4 +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 +Patch2: doxygen-no-libclang-cpp.patch +Patch3: RTFGenerator-should-exit-with-0-when-gengrate-file-s.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 -%if "%{xapian_core_support}" == "ON" +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 @@ -48,7 +57,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 \ @@ -56,6 +64,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} @@ -71,7 +80,7 @@ install -m644 -p -D doxywizard-4.png $icondir/48x48/apps/doxywizard.png install -m644 -p -D doxywizard-3.png $icondir/128x128/apps/doxywizard.png install -d %{buildroot}/%{_mandir}/man1 cp doc/*.1 %{buildroot}/%{_mandir}/man1/ -%if "%{xapian_core_support}" == "OFF" +%if %{xapian_core_support} == "OFF" rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1* %endif desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} @@ -82,7 +91,7 @@ make tests -C %{BuildDir} %files %license LICENSE %{_bindir}/doxygen -%if "%{xapian_core_support}" == "ON" +%if %{xapian_core_support} == "ON" %{_bindir}/{doxyindexer,doxysearch*} %endif @@ -96,11 +105,14 @@ make tests -C %{BuildDir} %doc LANGUAGE.HOWTO README.md %exclude %{_docdir}/packages %{_mandir}/man1/doxygen.1* -%if "%{xapian_core_support}" == "ON" +%if %{xapian_core_support} == "ON" %{_mandir}/man1/{doxyindexer.1*,doxysearch.1*} %endif %changelog +* Fri Oct 21 2022 yaoxin - 1:1.9.3-1 +- Update to 1.9.3-1 + * Sat Mar 12 2022 zoulin - 1.9.2-4 - detach the sub package doxygen-help from doxygen; - disable xapian_core_support 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