!47 Update to 1.9.3-1

From: @zhang__3125 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-06-22 11:12:42 +00:00 committed by Gitee
commit c6450aa4f0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 58 additions and 36 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.3.src.tar.gz Normal file

Binary file not shown.

View File

@ -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

View File

@ -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()

View File

@ -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);

View File

@ -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 <lin.zhang@turbolinux.com.cn> - 1:1.9.3-1
- Update to 1.9.3-1
* Tue Mar 29 2022 baizhonggui<baizhonggui@huawei.com> - 1.9.2-2
- Fix build error for string compare

BIN
doxywizard-icons.tar.xz Normal file

Binary file not shown.