!59 Upgrade to 1.9.6

From: @cherry530 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-05-12 01:18:11 +00:00 committed by Gitee
commit 2444dfbd0f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 6 additions and 68 deletions

View File

@ -1,25 +0,0 @@
From c23a12be8a23b9de7f6e78236cf1b571213cb5f9 Mon Sep 17 00:00:00 2001
From: si-gui <swx458333@huawei.com>
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

Binary file not shown.

BIN
doxygen-1.9.6.src.tar.gz Normal file

Binary file not shown.

View File

@ -1,13 +0,0 @@
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

View File

@ -1,11 +0,0 @@
--- 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()

View File

@ -1,12 +0,0 @@
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);

View File

@ -3,18 +3,14 @@
%global clang_support OFF
Name: doxygen
Epoch: 1
Version: 1.9.3
Release: 3
Version: 1.9.6
Release: 1
Summary: A documentation system for C/C++
License: GPL+
Url: https://www.doxygen.nl
Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz
Source1: doxywizard.desktop
Source2: doxywizard-icons.tar.xz
Patch0: %{name}-modify_footer.patch
Patch1: %{name}-no-lowercase-man-names.patch
Patch10: doxygen-no-libclang-cpp.patch
Patch11: RTFGenerator-should-exit-with-0-when-gengrate-file-s.patch
BuildRequires: python3 ImageMagick gcc-c++ gcc perl-interpreter
BuildRequires: python3-libxml2 texlive-bibtex
@ -84,7 +80,7 @@ rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/d
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%check
make tests -C %{BuildDir}
/usr/bin/ctest --test-dir %{BuildDir} --output-on-failure --force-new-ctest-process -j6
%files
%doc LANGUAGE.HOWTO README.md
@ -104,6 +100,9 @@ make tests -C %{BuildDir}
%{_datadir}/icons/hicolor/*/apps/doxywizard.png
%changelog
* Mon Apr 24 2023 xu_ping <707078654@qq.com> - 1:1.9.6-1
- Upgrade package to 1.9.6 version
* Wed Sep 21 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1:1.9.3-3
- set clang_support to default OFF