diff --git a/.gitignore b/.gitignore index 74ddfbb..2363cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ doxygen-1.7.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 diff --git a/doxygen-1.9.4-gcc12.1.patch b/doxygen-1.9.4-gcc12.1.patch new file mode 100644 index 0000000..e2ca6b8 --- /dev/null +++ b/doxygen-1.9.4-gcc12.1.patch @@ -0,0 +1,18 @@ +commit 5198966c8d5fec89116d025c74934ac03ea511fa +Author: Dimitri van Heesch +Date: Fri May 6 09:55:16 2022 +0200 + + issue #9312: Build: cache.h:53:14: error: 'exchange' is not a member of 'std' + +diff --git a/src/cache.h b/src/cache.h +index 0ff3092e..e218eb27 100644 +--- a/src/cache.h ++++ b/src/cache.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + /*! Fixed size cache for value type V using keys of type K. diff --git a/doxygen.spec b/doxygen.spec index 65228e3..52b274f 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -6,7 +6,7 @@ %global clang_support OFF %endif -%global stable 0 +%global stable 1 %if 0%{?stable} %global irelease 1 @@ -25,9 +25,9 @@ Release: %{irelease}%{?dist} # No version is specified. License: GPL+ -Url: http://www.doxygen.nl +Url: https://github.com/doxygen %if 0%{?stable} -Source0: https://doxygen.nl/files/%{name}-%{version}.src.tar.gz +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 @@ -36,6 +36,7 @@ Source1: doxywizard.desktop # these icons are part of doxygen and converted from doxywizard.ico Source2: doxywizard-icons.tar.xz # upstream patches +Patch0: doxygen-1.9.4-gcc12.1.patch BuildRequires: %{_bindir}/python3 BuildRequires: gcc-c++ gcc @@ -313,6 +314,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} %endif %changelog +* Fri May 06 2022 Than Ngo - 2:1.9.4-1 +- 1.9.4 + * Thu Feb 17 2022 Than Ngo - 2:1.9.4-0.20220217gite18f715e - update to 1.9.4 snapshot diff --git a/sources b/sources index c0431d9..affa651 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad -SHA512 (doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz) = 312b9c77444c9b81f5514f83bde113f22a51f83d76b7c7b426ed18a461c929d088cb1717c779c5c08cc0939b50a2f00dfe61754ee1a4dee3a69f70aedcef2043 +SHA512 (doxygen-1.9.4.src.tar.gz) = 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a