Compare commits

...

116 Commits
f24 ... rawhide

Author SHA1 Message Date
Than Ngo
cc385e03b0 replace obsolescent egrep with grep -E 2023-03-10 16:59:51 +01:00
Than Ngo
4c2570a288 migrated to SPDX license 2023-02-17 09:31:53 +01:00
Than Ngo
6f8058dfe7 rebuilt against ghostscript-10 2023-01-25 10:17:17 +01:00
Than Ngo
c3bee77416 fixed bz#2162170, add Require on texlive-wasy 2023-01-20 09:30:29 +01:00
Fedora Release Engineering
3f85f0ae60 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 01:44:56 +00:00
Than Ngo
f977bc6479 fixed bz#2161515 - doxygen FTBFS if _module_build is 1 2023-01-18 09:51:23 +01:00
Than Ngo
3f948a6a3b added doxywizard-icons.tar.xz back 2023-01-03 15:05:18 +01:00
Than Ngo
f1d9aad3d5 fixed bz#2156564, update to 1.9.6 2023-01-03 14:54:41 +01:00
Pete Walter
9067a3fa84 Rebuild for llvm 15 2022-09-18 15:47:34 +01:00
Than Ngo
8868712c8f update to 1.9.5 2022-09-09 11:01:32 +02:00
Than Ngo
eaf38ac359 Fixed #2113876, Failed to build LaTex output 2022-08-04 11:41:14 +02:00
Fedora Release Engineering
cd11c2f98d Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 00:52:32 +00:00
Than Ngo
225d187031 1.9.4 release 2022-05-06 12:07:09 +02:00
Than Ngo
da0ebbca9f dropped obsoletes patches 2022-02-17 17:28:40 +01:00
Than Ngo
afb87de38e update to 1.9.4 snapshot 2022-02-17 14:56:28 +01:00
Fedora Release Engineering
fef22c40ea - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 00:59:37 +00:00
Than Ngo
195466f02e revert 1.9.1, noarch package built differently on different architectures 2021-10-27 12:28:12 +02:00
Than Ngo
4095f4066e update 2021-10-27 10:36:59 +02:00
Tom Stellard
31148b2047 Rebuild for llvm-13.0.0 2021-10-07 23:28:03 +00:00
Mattias Ellert
5671b82de3 Use predictable and reproducible filenames (rhbz#2000138) 2021-09-13 16:43:50 +02:00
Than Ngo
79be305ff0 rebase to 1.9.2 2021-08-19 13:06:43 +02:00
Björn Esser
5f8d9f7800
Rebuild for clang-13.0.0 2021-08-17 19:33:09 +02:00
Fedora Release Engineering
73aaa730f4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 21:05:29 +00:00
Jonathan Wakely
0890706d79 Rebuilt for removed libstdc++ symbol (#1937698) 2021-03-30 19:35:57 +01:00
Than Ngo
b339bebe68 update source 2021-03-21 16:38:35 +01:00
Than Ngo
c465c5db9c drop test-suite 2021-02-22 17:36:03 +01:00
Than Ngo
97ec8457c6 fix typo 2021-02-10 11:31:02 +01:00
Than Ngo
a5c95acd27 - fixed Coverity issues
- fixed crash in docparser
2021-02-10 11:10:11 +01:00
Fedora Release Engineering
72520841ea - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 03:43:14 +00:00
Tom Stellard
1d10ce6df4 Rebuild for clang-11.1.0 2021-01-22 21:42:28 +00:00
Than Ngo
4ff8429b2c add doxgen-1.9.1-crash-when-parsing-config-file-part2.patch 2021-01-19 20:59:07 +01:00
Than Ngo
f1e6af5793 fixed doxygen crashes when parsing config file part2 2021-01-19 20:58:42 +01:00
Than Ngo
16e4f9c840 fixed bz#1916161, crashes when parsing config file 2021-01-19 09:36:30 +01:00
Than Ngo
b2647be5a1 rebase to 1.9.1 2021-01-11 17:48:59 +01:00
Than Ngo
4be37ca6b9 remove convert 2021-01-11 14:58:03 +01:00
Than Ngo
f96d63d27c drop BR on ImageMagick in RHEL 2021-01-11 14:55:48 +01:00
Than Ngo
6b0c5db74b attribute target redefined in SVG 2020-09-29 12:29:13 +02:00
Than Ngo
6f6455a533 backport upstream patches 2020-09-29 12:27:12 +02:00
Than Ngo
b77803a10c Fix doxygen crash 2020-09-17 21:13:17 +02:00
Mattias Ellert
f9a41fa6e4 Fix doxygen producing different results on 32 and 64 bit architectures
This is a fix for a regression introduced in version 1.8.17 that causes
doxygen to create different results on 32 and 64 bit achitectures.
This is a problem in Fedora because koji rejects builds where noarch
subpackages built on different architectures contain different sets
of files. See:
https://bugzilla.redhat.com/show_bug.cgi?id=1814356
https://github.com/doxygen/doxygen/issues/8022
2020-09-15 16:05:42 +02:00
Scott Talbert
2f055ba6e3 Fix issue with enums being defined in multiple files
This is a regression in 1.8.20 that causes python-wxpython4 to FTBFS.  More
information about the issue is available here:
https://github.com/doxygen/doxygen/issues/7979
2020-08-28 15:08:13 -04:00
Than Ngo
5d96c55069 fixed typo ctest 2020-08-25 15:00:37 +02:00
Than Ngo
34ef017706 update to 1.8.2 2020-08-25 14:26:47 +02:00
Fedora Release Engineering
ef5673b15d - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 00:40:38 +00:00
Fedora Release Engineering
01e34d6bf8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 15:42:13 +00:00
Than Ngo
551b0a2a0e fixed link issue against new clang 2020-07-08 14:25:56 +02:00
Than Ngo
4374fcf0de fixed bz#1834591, enable clang support in fedora 2020-06-18 17:21:22 +02:00
Tom Callaway
8aeb518c06 update tex dependencies 2020-05-27 10:26:19 -04:00
Than Ngo
39bce88529 update to 1.8.18
backport fixes: buffer-overflow, memory leeks and md5 hash does not match for2 diffferent runs
2020-05-25 16:41:13 +02:00
Björn Esser
e43b9abe4a
Another string quoting fix 2020-04-04 16:42:18 +02:00
Björn Esser
95b97f2a9e
Bump release 2020-04-02 13:27:46 +02:00
Björn Esser
68d9099e5d
Fix string quoting for rpm >= 4.16 2020-04-02 12:47:13 +02:00
Fedora Release Engineering
47ae7fd9b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 16:12:51 +00:00
Than Ngo
d1c4879feb - update to 1.8.17
- fixes test suite is failing
- fixes broken urls in the xml output
2020-01-14 11:50:27 +01:00
Than Ngo
7d44dfcd92 more coverity fixes 2019-12-10 14:20:47 +01:00
Than Ngo
31d4fa495a fixed covscan issues 2019-12-10 14:17:50 +01:00
Than Ngo
054d45a402 backpored upstream patch to fix #7248 2019-09-16 20:57:17 +02:00
Than Ngo
b8e030a12d add BR on git 2019-09-11 12:23:55 +02:00
Than Ngo
a8fac62078 resolves #1742614, update to 1.8.16 2019-09-11 11:55:10 +02:00
Fedora Release Engineering
b3059010fd - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 22:19:51 +00:00
Than Ngo
e0716db071 add xml fix for c++11 2019-03-20 11:03:58 +01:00
Christoph Junghans
6cce15d35b Incl. xml fix for c++11 2019-03-19 11:32:36 -06:00
Than Ngo
f47fc930b4 added license file 2019-03-16 19:57:52 +01:00
Than Ngo
433be75c81 added Requirement on dot 2019-03-13 11:06:26 +01:00
Than Ngo
b7bcaa3708 Add gating on tests 2019-03-06 18:39:53 +01:00
Jeroen van Meeuwen (Kolab Systems)
32d440d4b1 When %{_bindir}/python3 is required for the build, BuildRequire %{_bindir}/python3 2019-02-18 19:46:14 +01:00
Than Ngo
16df64000e fixed bz#1677000, fixed multilib issue 2019-02-14 23:15:00 +01:00
Than Ngo
32e3f8ab66 fixed doxygen 1.8.15 segfault 2019-02-12 14:10:11 +01:00
Than Ngo
135737fac1 fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex 2019-02-08 14:09:09 +01:00
Than Ngo
3453b33b8f fix bz#673228 - doxgen 1.8.15 operator whitespace changes cause wxpython FTBFS 2019-02-08 13:37:32 +01:00
Than Ngo
73e6d66a71 fixed bz#1671999, backported from upstream
added test for XML output with an empty TOC
2019-02-05 15:52:59 +01:00
Fedora Release Engineering
7448e7ae78 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 17:32:40 +00:00
Than Ngo
70024853b1 update to 1.8.15 2019-01-28 16:24:02 +01:00
Than Ngo
c63dd6e3d7 enable testing 2018-12-06 16:11:55 +01:00
Than Ngo
69dc56e4e2 add BR: gcc-c++ gcc 2018-07-23 13:35:01 +02:00
Fedora Release Engineering
eadb2df343 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 23:06:19 +00:00
Than Ngo
e06306446f - add BR on zlib-devel
- build with python3
2018-06-27 13:43:40 +02:00
Than Ngo
0dbbc6466d support Qt5 2018-06-27 12:30:49 +02:00
Than Ngo
4cffc7e873 enble search addon on fedora 2018-06-20 16:19:58 +02:00
Than Ngo
43c245dc6c added missing adjustbox.sty for refman 2018-04-30 22:49:39 +02:00
Fedora Release Engineering
a2541207e7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 07:14:49 +00:00
Than Ngo
42ab4a4b1e update to 1.8.14 2017-12-29 17:13:22 +01:00
Fedora Release Engineering
1114a5c118 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 19:44:55 +00:00
Fedora Release Engineering
26a05e8a1a - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 06:30:57 +00:00
Petr Písař
7fed52f609 perl dependency renamed to perl-interpreter <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules> 2017-07-13 11:42:59 +02:00
Than Ngo
248e03dca3 - backport to fix C# property initializer parsing
- backport to fix non reachable links and redirected links in documentation
2017-07-04 14:29:08 +02:00
Than Ngo
6307b377a6 - backport to fix problem where automatic line breaking caused
missing vertical bars in the parameter table for Latex output
2017-05-30 18:14:44 +02:00
Than Ngo
b2f503aa85 Fixed problem where automatic line breaking caused missing vertical bars in the parameter table for Latex output 2017-05-30 18:12:49 +02:00
Karsten Hopp
dc9ca70b1d fix _module_build macro 2017-04-22 22:45:06 +02:00
Karsten Hopp
07444683fe use new _module_build macro to limit dependencies for Modularity 2017-04-21 12:58:19 +02:00
Karsten Hopp
4ccf308fc3 bootstrap version without docs and texlive dependencies for Modularity 2017-04-20 13:55:30 +02:00
Than Ngo
127e038077 backport to fix behavior of @ref const matching (#776988) 2017-03-13 16:45:30 +01:00
Fedora Release Engineering
a772aabeb5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 08:34:43 +00:00
Than Ngo
1fdd96ddf3 Bug 775493 - Usage of underscore's in parameter names 2017-01-19 11:09:55 +01:00
Björn Esser
2920bf432f Add upstream patch to fix regression (rhbz#1413296) 2017-01-17 17:40:07 +01:00
Than Ngo
86b5211513 Merge branch 'master' into f25 2017-01-13 16:34:08 +01:00
Orion Poplawski
979ed8e03d Update to 1.8.13
Drop upstream patches
2016-12-29 13:33:41 -07:00
Orion Poplawski
ebbd643652 Add upstream bug link; update patch 2016-12-21 23:00:20 -07:00
Orion Poplawski
f810f3c034 Add patch to build with python rc 2016-12-21 22:46:00 -07:00
Orion Poplawski
24070d0073 Rebuild for xapian soname bump 2016-12-21 22:01:06 -07:00
Than Ngo
44085665ca - backport upstream patch to fix
Bug 707266 - C++/CLI indexed property not documented
    Bug 774949 - Unknown reference in manual
    Bug 775245 - referencing Python files via tagfile broken
2016-12-12 14:25:52 +01:00
Than Ngo
0c63ab8fe2 Merge branch 'master' into f25 2016-12-08 17:33:10 +01:00
Than Ngo
dfc5f33cc2 - fixed bz#1402043 - runtime dependency on perl 2016-12-08 17:32:01 +01:00
Than Ngo
e5435d47ff Bug 774138 . add HTML classes to "Definition at..." & "Referenced by..." for CSS 2016-12-08 16:56:32 +01:00
Than Ngo
0aeec2da5d Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work 2016-11-25 13:29:31 +01:00
Than Ngo
4563ad1003 Merge branch 'master' into f25 2016-11-15 13:23:52 +01:00
Than Ngo
810d0d616b add Requires: tex(import.sty), Requires: tex(tabu.sty), Requires: tex(appendix.sty) for latex 2016-11-15 13:12:32 +01:00
Than Ngo
9691646b80 Merge branch 'master' into f25 2016-11-15 13:07:45 +01:00
Than Ngo
60e3e105cb add BR on appendix.sty 2016-11-15 12:52:04 +01:00
Than Ngo
3189626ce0 - bz#1394456, add missing docs
- fix build issue when build_doc=ON
2016-11-15 11:39:54 +01:00
Than Ngo
51a1d8e570 backport upstream fixes:
Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error
   Bug 771344 - Class name 'internal' breaks class hierarchy in C++
2016-10-20 11:57:02 +02:00
Than Ngo
84805892b8 drop doxygen-percent_sign patch which is included in upstream 2016-09-06 13:32:39 +02:00
Than Ngo
c1234f26e3 drop doxygen-percent_sign patch which is included in upstream 2016-09-06 13:31:37 +02:00
Than Ngo
437232a035 add BR on xapian-core-devel 2016-09-06 11:42:29 +02:00
Than Ngo
7a422be2e2 fixed bz#1373167 - doxygen ships bogus man pages 2016-09-06 11:36:01 +02:00
Than Ngo
a4ca9ac35e update to 1.8.12 2016-09-06 11:07:56 +02:00
5 changed files with 574 additions and 56 deletions

15
.gitignore vendored
View File

@ -44,3 +44,18 @@ doxygen-1.7.1.src.tar.gz
/doxygen-1.8.9.1.src.tar.gz
/doxygen-1.8.10.src.tar.gz
/doxygen-1.8.11.src.tar.gz
/doxygen-1.8.12.src.tar.gz
/doxygen-1.8.13.src.tar.gz
/doxygen-1.8.14.src.tar.gz
/doxygen-1.8.15.src.tar.gz
/doxygen-1.8.16.src.tar.gz
/doxygen-1.8.17.src.tar.gz
/doxygen-1.8.18.src.tar.gz
/doxywizard-icons.tar.xz
/doxygen-1.9.1.src.tar.gz
/doxygen-1.9.2.src.tar.gz
/doxygen-1.9.2-d882240f-git.src.tar.gz
/doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz
/doxygen-1.9.4.src.tar.gz
/doxygen-1.9.5.src.tar.gz
/doxygen-1.9.6.src.tar.gz

View File

@ -0,0 +1,40 @@
--- doxygen-1.9.6.orig/templates/latex/latexmakefile.tpl 2023-03-09 10:29:08.772377871 +0100
+++ doxygen-1.9.6/templates/latex/latexmakefile.tpl 2023-03-09 10:29:23.754555476 +0100
@@ -9,7 +9,7 @@
{# TODO: generateBib #}
pdflatex refman
latex_count=8 ; \
- while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
+ while grep -E -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
do \
echo "Rerunning latex...." ;\
pdflatex refman ;\
@@ -43,7 +43,7 @@
echo "Rerunning latex...."
{{ config.LATEX_CMD_NAME }} refman.tex
latex_count=8 ; \
- while egrep -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
+ while grep -E -s 'Rerun (LaTeX|to get cross-references right)' refman.log && [ $$latex_count -gt 0 ] ;\
do \
echo "Rerunning latex...." ;\
{{ config.LATEX_CMD_NAME }} refman.tex ;\
--- doxygen-1.9.6.orig/src/latexgen.cpp 2023-03-09 11:10:52.092688592 +0100
+++ doxygen-1.9.6/src/latexgen.cpp 2023-03-09 11:11:07.666867516 +0100
@@ -346,7 +346,7 @@
t << "\techo \"Rerunning latex....\"\n"
<< "\t$(LATEX_CMD) $(MANUAL_FILE).tex\n"
<< "\tlatex_count=$(LATEX_COUNT) ; \\\n"
- << "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
+ << "\twhile grep -E -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
<< "\t do \\\n"
<< "\t echo \"Rerunning latex....\" ;\\\n"
<< "\t $(LATEX_CMD) $(MANUAL_FILE).tex ; \\\n"
@@ -374,7 +374,7 @@
}
t << "\t$(LATEX_CMD) $(MANUAL_FILE)\n"
<< "\tlatex_count=$(LATEX_COUNT) ; \\\n"
- << "\twhile egrep -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
+ << "\twhile grep -E -s 'Rerun (LaTeX|to get cross-references right|to get bibliographical references right)' $(MANUAL_FILE).log && [ $$latex_count -gt 0 ] ;\\\n"
<< "\t do \\\n"
<< "\t echo \"Rerunning latex....\" ;\\\n"
<< "\t $(LATEX_CMD) $(MANUAL_FILE) ;\\\n"

View File

@ -1,13 +0,0 @@
diff -up doxygen-1.8.11/src/util.cpp.than doxygen-1.8.11/src/util.cpp
--- doxygen-1.8.11/src/util.cpp.than 2016-03-06 11:13:21.831912181 +0100
+++ doxygen-1.8.11/src/util.cpp 2016-03-06 11:15:20.359280738 +0100
@@ -6732,6 +6732,9 @@ QCString latexEscapePDFString(const char
case '\\': t << "\\textbackslash{}"; break;
case '{': t << "\\{"; break;
case '}': t << "\\}"; break;
+ case '_': t << "\\_"; break;
+ case '%': t << "\\%"; break;
+ case '&': t << "\\&"; break;
default:
t << c;
break;

View File

@ -1,36 +1,132 @@
%if 0%{?fedora}
%global xapian_core_support ON
%global clang_support ON
%else
%global xapian_core_support OFF
%global clang_support OFF
%endif
%global stable 1
%if 0%{?stable}
%global irelease 2
%else
%global commit e18f715eb55121a4219d00bc4d824cebf1fb504b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global date 20220217
%global irelease 0.%{date}git%{shortcommit}
%endif
Summary: A documentation system for C/C++
Name: doxygen
Epoch: 1
Version: 1.8.11
Release: 4%{?dist}
Epoch: 2
Version: 1.9.6
%if 0%{?stable}
Release: 7%{?dist}
%else
%global commit e18f715eb55121a4219d00bc4d824cebf1fb504b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global date 20220217
Release: 0.%{date}git%{shortcommit}.1
%endif
# No version is specified.
License: GPL+
Url: http://www.stack.nl/~dimitri/doxygen/index.html
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
License: GPL-1.0-or-later
Url: https://github.com/doxygen
%if 0%{?stable}
Source0: https://sourceforge.net/projects/doxygen/files/rel-%{version}/%{name}-%{version}.src.tar.gz
%else
Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
%endif
# this icon is part of kdesdk
Source1: doxywizard.png
Source2: doxywizard.desktop
Source1: doxywizard.desktop
# these icons are part of doxygen and converted from doxywizard.ico
Source2: doxywizard-icons.tar.xz
# upstream patches
Patch0: doxygen-obsolete-egrep.patch
# upstream fixes
Patch1: doxygen-percent_sign.patch
BuildRequires: %{_bindir}/python3
BuildRequires: gcc-c++ gcc
BuildRequires: perl-interpreter, perl-open
BuildRequires: texlive-bibtex
BuildRequires: perl
%if ! 0%{?_module_build}
BuildRequires: tex(dvips)
BuildRequires: tex(latex)
BuildRequires: tex(multirow.sty)
# From doc/manual.sty
BuildRequires: tex(helvet.sty)
BuildRequires: tex(sectsty.sty)
BuildRequires: tex(tocloft.sty)
BuildRequires: tex(fontenc.sty)
BuildRequires: tex(fancyhdr.sty)
# From templates/latex/doxygen.sty
BuildRequires: tex(alltt.sty)
BuildRequires: tex(calc.sty)
BuildRequires: tex(float.sty)
BuildRequires: tex(verbatim.sty)
BuildRequires: tex(xcolor.sty)
BuildRequires: tex(fancyvrb.sty)
BuildRequires: tex(tabularx.sty)
BuildRequires: tex(multirow.sty)
BuildRequires: tex(hanging.sty)
BuildRequires: tex(ifpdf.sty)
BuildRequires: tex(adjustbox.sty)
BuildRequires: tex(amssymb.sty)
BuildRequires: tex(stackengine.sty)
BuildRequires: tex(ulem.sty)
# From doc/doxygen_manual.tex
BuildRequires: tex(ifthen.sty)
BuildRequires: tex(array.sty)
BuildRequires: tex(geometry.sty)
BuildRequires: tex(makeidx.sty)
BuildRequires: tex(natbib.sty)
BuildRequires: tex(graphicx.sty)
BuildRequires: tex(multicol.sty)
BuildRequires: tex(float.sty)
BuildRequires: tex(geometry.sty)
BuildRequires: tex(listings.sty)
BuildRequires: tex(color.sty)
BuildRequires: tex(xcolor.sty)
BuildRequires: tex(textcomp.sty)
BuildRequires: tex(wasysym.sty)
BuildRequires: tex(import.sty)
BuildRequires: tex(appendix.sty)
BuildRequires: tex(hyperref.sty)
BuildRequires: tex(pspicture.sty)
BuildRequires: tex(inputenc.sty)
BuildRequires: tex(mathptmx.sty)
BuildRequires: tex(courier.sty)
# From src/latexgen.cpp
BuildRequires: tex(fixltx2e.sty)
BuildRequires: tex(ifxetex.sty)
BuildRequires: tex(caption.sty)
BuildRequires: tex(etoc.sty)
# From src/util.cpp
BuildRequires: tex(newunicodechar.sty)
# From templates/latex/tabu_doxygen.sty
BuildRequires: tex(varwidth.sty)
BuildRequires: tex(xtab.sty)
BuildRequires: tex(tabu.sty)
BuildRequires: /usr/bin/epstopdf
BuildRequires: texlive-epstopdf
BuildRequires: ghostscript
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: graphviz
%endif
BuildRequires: zlib-devel
BuildRequires: flex
BuildRequires: bison
BuildRequires: desktop-file-utils
BuildRequires: cmake
BuildRequires: graphviz
BuildRequires: git
%if "x%{?xapian_core_support}" == "xON"
BuildRequires: xapian-core-devel
%endif
%if "x%{?clang_support}" == "xON"
BuildRequires: llvm-devel
BuildRequires: clang-devel
%endif
Requires: perl-interpreter
Requires: graphviz
%description
Doxygen can generate an online class browser (in HTML) and/or a
@ -39,10 +135,12 @@ documentation is extracted directly from the sources. Doxygen can
also be configured to extract the code structure from undocumented
source files.
%if ! 0%{?_module_build}
%package doxywizard
Summary: A GUI for creating and editing configuration files
Requires: %{name} = %{epoch}:%{version}-%{release}
BuildRequires: qt4-devel
BuildRequires: qt5-qtbase-devel
%description doxywizard
Doxywizard is a GUI for creating and editing configuration files that
are used by doxygen.
@ -51,20 +149,83 @@ are used by doxygen.
Summary: Support for producing latex/pdf output from doxygen
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: tex(latex)
Requires: tex(dvips)
Requires: texlive-wasy
%if 0%{?fedora} > 17 || 0%{?rhel} > 6
Requires: tex(multirow.sty)
# From doc/manual.sty
Requires: tex(helvet.sty)
Requires: tex(sectsty.sty)
Requires: tex(tocloft.sty)
Requires: tex(fontenc.sty)
Requires: tex(fancyhdr.sty)
# From templates/latex/doxygen.sty
Requires: tex(alltt.sty)
Requires: tex(calc.sty)
Requires: tex(float.sty)
Requires: tex(verbatim.sty)
Requires: tex(xcolor.sty)
Requires: tex(fancyvrb.sty)
Requires: tex(tabularx.sty)
Requires: tex(multirow.sty)
Requires: tex(hanging.sty)
Requires: tex(ifpdf.sty)
Requires: tex(adjustbox.sty)
Requires: tex(amssymb.sty)
Requires: tex(stackengine.sty)
Requires: tex(ulem.sty)
# From doc/doxygen_manual.tex
Requires: tex(ifthen.sty)
Requires: tex(array.sty)
Requires: tex(geometry.sty)
Requires: tex(makeidx.sty)
Requires: tex(natbib.sty)
Requires: tex(graphicx.sty)
Requires: tex(multicol.sty)
Requires: tex(float.sty)
Requires: tex(geometry.sty)
Requires: tex(listings.sty)
Requires: tex(color.sty)
Requires: tex(xcolor.sty)
Requires: tex(textcomp.sty)
Requires: tex(wasysym.sty)
Requires: tex(import.sty)
Requires: tex(appendix.sty)
Requires: tex(hyperref.sty)
Requires: tex(pspicture.sty)
Requires: tex(inputenc.sty)
Requires: tex(mathptmx.sty)
Requires: tex(courier.sty)
# From src/latexgen.cpp
Requires: tex(fixltx2e.sty)
Requires: tex(ifxetex.sty)
Requires: tex(caption.sty)
Requires: tex(etoc.sty)
# From src/util.cpp
Requires: tex(newunicodechar.sty)
# From templates/latex/tabu_doxygen.sty
Requires: tex(varwidth.sty)
# I'm 99% sure this isn't needed anymore since
# doxygen has a local fork of tabu... but it doesn't seem to be hurting anything.
Requires: tex(tabu.sty)
# There also does not seem to be any references to xtab in the code... but eh.
Requires: tex(xtab.sty)
Requires: texlive-epstopdf-bin
# Explicitly called binaries
Requires: texlive-bibtex
Requires: texlive-makeindex
Requires: texlive-epstopdf
%endif
%description latex
%{summary}.
%endif
%prep
%setup -q
%patch1 -p1
%if 0%{?stable}
%autosetup -p1 -a2
%else
%autosetup -n %{name}-%{commit} -a2
%endif
# convert into utf-8
iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
@ -73,53 +234,368 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%if ! 0%{?_module_build}
%cmake \
-Dbuild_doc=OFF \
-Dbuild_wizard=ON \
-Dbuild_xmlparser=ON \
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
..
popd
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-Duse_libclang=%{clang_support} \
-Dbuild_doc=OFF \
-Dbuild_wizard=ON \
-Dbuild_xmlparser=ON \
-Dbuild_search=%{xapian_core_support} \
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
%else
%cmake \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-Duse_libclang=%{clang_support} \
-Dbuild_doc=OFF \
-Dbuild_wizard=OFF \
-Dbuild_xmlparser=ON \
-Dbuild_search=OFF \
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
%endif
make %{?_smp_mflags} -C %{_target_platform}
%cmake_build %{?_smp_mflags}
%install
make install \
DESTDIR=%{buildroot} \
-C %{_target_platform}
%cmake_install
install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png
# install icons
icondir=%{buildroot}%{_datadir}/icons/hicolor
mkdir -m755 -p $icondir/{16x16,32x32,48x48,128x128}/apps
install -m644 -p -D doxywizard-6.png $icondir/16x16/apps/doxywizard.png
install -m644 -p -D doxywizard-5.png $icondir/32x32/apps/doxywizard.png
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 man pages
mkdir -p %{buildroot}/%{_mandir}/man1
cp doc/*.1 %{buildroot}/%{_mandir}/man1/
%if 0%{?_module_build}
rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
%endif
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%if "x%{?xapian_core_support}" == "xOFF"
rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1*
%endif
# remove duplicate
rm -rf %{buildroot}/%{_docdir}/packages
%if ! 0%{?_module_build}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%endif
%check
%ctest
%files
%doc LANGUAGE.HOWTO README.md
%license LICENSE
%if ! 0%{?_module_build}
%if "x%{?xapian_core_support}" == "xON"
%{_bindir}/doxyindexer
%{_bindir}/doxysearch*
%endif
%endif
%{_bindir}/doxygen
%{_mandir}/man1/doxygen.1*
%if "x%{?xapian_core_support}" == "xON"
%{_mandir}/man1/doxyindexer.1*
%{_mandir}/man1/doxysearch.1*
%endif
%if ! 0%{?_module_build}
%files doxywizard
%{_bindir}/doxywizard
%{_mandir}/man1/doxywizard*
%{_datadir}/applications/doxywizard.desktop
%{_datadir}/pixmaps/doxywizard.png
%endif
%{_datadir}/icons/hicolor/*/apps/doxywizard.png
%if ! 0%{?_module_build}
%files latex
# intentionally left blank
%endif
%changelog
* Fri Mar 10 2023 Than Ngo <than@redhat.com> - 2:1.9.6-7
- replace obsolescent egrep with grep -E
* Fri Feb 17 2023 Than Ngo <than@redhat.com> - 2:1.9.6-6
- migrated to SPDX license
* Wed Jan 25 2023 Than Ngo <than@redhat.com> - 2:1.9.6-5
- rebuilt against new ghostscript-10
* Fri Jan 20 2023 Than Ngo <than@redhat.com> - 2:1.9.6-4
- fixed bz#2162170, add Require on texlive-wasy
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 18 2023 Than Ngo <than@redhat.com> - 2:1.9.6-2
- fixed bz#2161515 - doxygen FTBFS if _module_build is 1
* Tue Jan 03 2023 Than Ngo <than@redhat.com> - 2:1.9.6-1
- fixed bz#2156564, update to 1.9.6
* Sun Sep 18 2022 Pete Walter <pwalter@fedoraproject.org> - 2:1.9.5-2
- Rebuild for llvm 15
* Fri Sep 09 2022 Than Ngo <than@redhat.com> - 2:1.9.5-1
- 1.9.5
* Thu Aug 04 2022 Than Ngo <than@redhat.com> - 2:1.9.4-2
- Fixed #2113876, Failed to build LaTex output
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.4-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri May 06 2022 Than Ngo <than@redhat.com> - 2:1.9.4-1
- 1.9.4
* Thu Feb 17 2022 Than Ngo <than@redhat.com> - 2:1.9.4-0.20220217gite18f715e
- update to 1.9.4 snapshot
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Oct 27 2021 Than Ngo <than@redhat.com> - 2:1.9.1-12
- revert 1.9.1, noarch package built differently on different architectures
* Wed Oct 27 2021 Than Ngo <than@redhat.com> - 1:1.9.2-4
- update
* Thu Oct 07 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.2-3
- Rebuild for llvm-13.0.0
* Sun Sep 12 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.9.2-2
- Use predictable and reproducible filenames (rhbz#2000138)
* Thu Aug 19 2021 Than Ngo <than@redhat.com> - 1:1.9.2-1
- rebase to 1.9.2
* Tue Aug 17 2021 Björn Esser <besser82@fedoraproject.org> - 1:1.9.1-11
- Rebuild for clang-13.0.0
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 1:1.9.1-9
- Rebuilt for removed libstdc++ symbol (#1937698)
* Sun Mar 21 2021 Than Ngo <than@redhat.com> - 1:1.9.1-8
- update source
* Mon Feb 22 2021 Than Ngo <than@redhat.com> - 1:1.9.1-7
- drop test-suite
* Wed Feb 10 2021 Than Ngo <than@redhat.com> - 1:1.9.1-6
- fixed Coverity issues
- fixed crash in docparser
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 22 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.1-4
- Rebuild for clang-11.1.0
* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-3
- fixed doxygen crashes when parsing config file part2
* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-2
- fixed bz#1916161, crashes when parsing config file
* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.9.1-1
- update to 1.9.1
* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.8.20-6
- drop BR on ImageMagick in RHEL
* Tue Sep 29 2020 Than Ngo <than@redhat.com> - 1.8.20-5
- backport upstream patches
* Thu Sep 17 2020 Than Ngo <than@redhat.com> - 1.8.20-4
- Fix doxygen crash
* Tue Sep 15 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.8.20-3
- Fix doxygen producing different results on 32 and 64 bit architectures
* Fri Aug 28 2020 Scott Talbert <swt@techie.net> - 1:1.8.20-2
- Fix issue with enums being defined in multiple files
* Tue Aug 25 2020 Than Ngo <than@redhat.com> - 1.8.20-1
- update to 1.8.20
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-6
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 08 2020 Than Ngo <than@redhat.com> - 1.8.18-4
- fixed link issue against new clang
* Thu Jun 18 2020 Than Ngo <than@redhat.com> - 1.8.18-3
- fixed bz#1834591, enable clang support in fedora
* Wed May 27 2020 Tom Callaway <spot@fedoraproject.org> - 1.8.18-2
- update tex dependencies
* Mon May 25 2020 Than Ngo <than@redhat.com> - 1.8.18-1
- update to 1.8.18
- backport fixes: buffer-overflow, memory leeks and md5 hash does not match for
2 diffferent runs
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 1:1.8.17-3
- Fix string quoting for rpm >= 4.16
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Jan 14 2020 Than Ngo <than@redhat.com> - 1:1.8.17-1
- resolves #1786799, update to 1.8.17
* Tue Dec 10 2019 Than Ngo <than@redhat.com> - 1:1.8.16-3
- fixed covscan issues
* Mon Sep 16 2019 Than Ngo <than@redhat.com> - 1:1.8.16-2
- backpored upstream patch to fix #7248
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 1:1.8.16-1
- resolves #1742614, update to 1.8.16
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 19 2019 Christoph Junghans <junghans@votca.org> - 1:1.8.15-9
- Incl. xml fix for c++11
* Sat Mar 16 2019 Than Ngo <than@redhat.com> - 1:1.8.15-8
- added license file
* Wed Mar 13 2019 Than Ngo <than@redhat.com> - 1:1.8.15-7
- added Requirement on dot
* Thu Feb 14 2019 Than Ngo <than@redhat.com> - 1:1.8.15-6
- fixed bz#1677000, fixed multilib issue
* Tue Feb 12 2019 Than Ngo <than@redhat.com> - 1:1.8.15-5
- fixed bz#1675288, doxygen 1.8.15 segfault
* Fri Feb 08 2019 Than Ngo <than@redhat.com> - 1:1.8.15-4
- fixed bz#673228 - operator whitespace changes cause wxpython FTBFS
- fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex
* Tue Feb 05 2019 Than Ngo <than@redhat.com> - 1:1.8.15-3
- fixed bz#1671999, backported from upstream
- added test for XML output with an empty TOC
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 28 2019 Than Ngo <than@redhat.com> - 1:1.8.15-1
- update to 1.8.15
* Thu Dec 06 2018 Than Ngo <than@redhat.com> - 1:1.8.14-8
- enable testing
* Mon Jul 23 2018 Than Ngo <than@redhat.com> - 1:1.8.14-7
- add BR: gcc-c++ gcc
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 27 2018 Than Ngo <than@redhat.com> - 1:1.8.14-5
- support Qt5
* Wed Jun 20 2018 Than Ngo <than@redhat.com> - 1.8.14-4
- enble search addon on fedora
* Mon Apr 30 2018 Than Ngo <than@redhat.com> - 1.8.14-3
- added missing BR on adjustbox.sty for refman
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Dec 29 2017 Than Ngo <than@redhat.com> - 1:1.8.14-1
- update to 1.8.14
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 1:1.8.13-10
- perl dependency renamed to perl-interpreter
<https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
* Tue Jul 04 2017 Than Ngo <than@redhat.com> - 1:1.8.13-9
- backport to fix C# property initializer parsing
- backport to fix non reachable links and redirected links in documentation
* Tue May 30 2017 Than Ngo <than@redhat.com> - 1:1.8.13-8
- backport to fix problem where automatic line breaking caused
missing vertical bars in the parameter table for Latex output
* Sat Apr 22 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-7
- fix _module_build macro
* Fri Apr 21 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-6
- use new _module_build macro to limit dependencies for Modularity
* Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5
- backport to fix behavior of @ref const matching (#776988)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jan 19 2017 Than Ngo <than@redhat.com> - 1:1.8.13-3
- Bug 775493 - Usage of underscore's in parameter names
* Tue Jan 17 2017 Björn Esser <besser82@fedoraproject.org> - 1:1.8.13-2
- Add upstream patch to fix regression (rhbz#1413296)
* Thu Dec 29 2016 Orion Poplawski <orion@cora.nwra.com> - 1:1.8.13-1
- Update to 1.8.13
- Drop upstream patches
* Thu Dec 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1:1.8.12-7
- Rebuild for xapian soname bump
- Add patch to build with python rc
* Mon Dec 12 2016 Than Ngo <than@redhat.com> - 1:1.8.12-6
- backport upstream patch to fix
Bug 707266 - C++/CLI indexed property not documented
Bug 774949 - Unknown reference in manual
Bug 775245 - referencing Python files via tagfile broken
* Thu Dec 08 2016 Than Ngo <than@redhat.com> - 1:1.8.12-5
- fixed bz#1402043 - runtime dependency on perl
- backport upstream patch to fix Bug 774138 . add HTML classes to "Definition at..." & "Referenced by..." for CSS
* Fri Nov 25 2016 Than Ngo <than@redhat.com> - - 1:1.8.12-4
- Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work
* Tue Nov 15 2016 Than Ngo <than@redhat.com> - 1:1.8.12-3
- bz#1394456, add missing docs
- fix build issue when build_doc=ON
* Thu Oct 20 2016 Than Ngo <than@redhat.com> - 1:1.8.12-2
- backport upstream fixes
Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error
Bug 771344 - Class name 'internal' breaks class hierarchy in C++
* Tue Sep 06 2016 Than Ngo <than@redhat.com> - 1:1.8.12-1
- 1.8.12
- fixed bz#1373167 - doxygen ships bogus man pages
* Sun Mar 06 2016 Than Ngo <than@redhat.com> - 1:1.8.11-4
- bz#1305739, Unescaped percent sign in doxygen

View File

@ -1,2 +1,2 @@
1a84da877450422c5fc49e525c546cd4 doxywizard.png
f4697a444feaed739cfa2f0644abc19b doxygen-1.8.11.src.tar.gz
SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
SHA512 (doxygen-1.9.6.src.tar.gz) = f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2