From 38e84d83faf49341c61440c9b888db0ff6d352cb Mon Sep 17 00:00:00 2001 From: zhangruifang2020 Date: Tue, 13 Aug 2024 15:22:53 +0800 Subject: [PATCH 1/2] sync patches --- doxygen-no-libclang-cpp.patch | 11 +++++++++++ doxygen-no-lowercase-man-names.patch | 12 ++++++++++++ doxygen.spec | 8 +++++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 doxygen-no-libclang-cpp.patch create mode 100644 doxygen-no-lowercase-man-names.patch diff --git a/doxygen-no-libclang-cpp.patch b/doxygen-no-libclang-cpp.patch new file mode 100644 index 0000000..1e6fdc4 --- /dev/null +++ b/doxygen-no-libclang-cpp.patch @@ -0,0 +1,11 @@ +--- doxygen-1.9.6/src/CMakeLists.txt.orig 2022-12-21 02:30:03.000000000 +0800 ++++ doxygen-1.9.6/src/CMakeLists.txt 2024-08-13 15:15:47.219115393 +0800 +@@ -379,7 +379,7 @@ + add_definitions(-DCINDEX_NO_EXPORTS) + 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 0000000..e0719e9 --- /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 77e844f..89ab35b 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -4,7 +4,7 @@ Name: doxygen Epoch: 1 Version: 1.9.6 -Release: 1 +Release: 2 Summary: A documentation system for C/C++ License: GPL+ Url: https://www.doxygen.nl @@ -12,6 +12,9 @@ Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz Source1: doxywizard.desktop Source2: doxywizard-icons.tar.xz +Patch0: doxygen-no-lowercase-man-names.patch +Patch1: doxygen-no-libclang-cpp.patch + BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter BuildRequires: python3-libxml2 texlive-bibtex BuildRequires: desktop-file-utils graphviz flex bison cmake @@ -100,6 +103,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %{_datadir}/icons/hicolor/*/apps/doxywizard.png %changelog +* Tue Aug 13 2024 zhangruifang - 1:1.9.6-2 +- sync patches + * Mon Apr 24 2023 xu_ping <707078654@qq.com> - 1:1.9.6-1 - Upgrade package to 1.9.6 version -- Gitee From 356c90131530822a81ed83fe5163c0422fd85118 Mon Sep 17 00:00:00 2001 From: "ruifang.zhang" Date: Tue, 13 Aug 2024 08:18:54 +0000 Subject: [PATCH 2/2] update doxygen.spec. Signed-off-by: ruifang.zhang --- doxygen.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doxygen.spec b/doxygen.spec index 89ab35b..1829823 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -12,8 +12,8 @@ Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz Source1: doxywizard.desktop Source2: doxywizard-icons.tar.xz -Patch0: doxygen-no-lowercase-man-names.patch -Patch1: doxygen-no-libclang-cpp.patch +#Patch0: doxygen-no-lowercase-man-names.patch +#Patch1: doxygen-no-libclang-cpp.patch BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter BuildRequires: python3-libxml2 texlive-bibtex -- Gitee