From 8868712c8ff865c7b37a3e25aa7bc467b9f6de86 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 9 Sep 2022 11:01:32 +0200
Subject: [PATCH] update to 1.9.5

---
 .gitignore                                    |  1 +
 doxygen-1.9.4-gcc12.1.patch                   | 18 ------------------
 ...typo_in_generated_Makefile_for_LaTex.patch | 19 -------------------
 doxygen.spec                                  |  9 +++++----
 sources                                       |  2 +-
 5 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 doxygen-1.9.4-gcc12.1.patch
 delete mode 100644 doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch

diff --git a/.gitignore b/.gitignore
index 2363cb3..a966a88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ doxygen-1.7.1.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
diff --git a/doxygen-1.9.4-gcc12.1.patch b/doxygen-1.9.4-gcc12.1.patch
deleted file mode 100644
index e2ca6b8..0000000
--- a/doxygen-1.9.4-gcc12.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 5198966c8d5fec89116d025c74934ac03ea511fa
-Author: Dimitri van Heesch <doxygen@gmail.com>
-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 <list>
- #include <unordered_map>
- #include <mutex>
-+#include <utility>
- #include <ctype.h>
- 
- /*! Fixed size cache for value type V using keys of type K.
diff --git a/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch b/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch
deleted file mode 100644
index 99fde06..0000000
--- a/doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4
-Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Mon Jul 25 21:40:19 2022 +0200
-
-    Fix typo in generated Makefile for LaTex
-
-diff --git a/src/latexgen.cpp b/src/latexgen.cpp
-index d3ad3bd3..c5f436ce 100644
---- a/src/latexgen.cpp
-+++ b/src/latexgen.cpp
-@@ -337,7 +337,7 @@ static void writeLatexMakefile()
-     }
-     t << "\techo \"Rerunning latex....\"\n"
-       << "\t$(LATEX_CMD) $(MANUAL_FILE).tex\n"
--      << "\tlatex_count=%(LATEX_COUNT) ; \\\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"
-       << "\t    do \\\n"
-       << "\t      echo \"Rerunning latex....\" ;\\\n"
diff --git a/doxygen.spec b/doxygen.spec
index 004aa17..6eddba1 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -20,9 +20,9 @@
 Summary: A documentation system for C/C++
 Name:    doxygen
 Epoch:   2
-Version: 1.9.4
+Version: 1.9.5
 %if 0%{?stable}
-Release: 2%{?dist}
+Release: 1%{?dist}
 %else
 %global commit e18f715eb55121a4219d00bc4d824cebf1fb504b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -42,8 +42,6 @@ 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
-Patch1: doxygen-6f6b3be36c51a0e7436538d8b99a7e3350a6c3a4-typo_in_generated_Makefile_for_LaTex.patch
 
 BuildRequires: %{_bindir}/python3
 BuildRequires: gcc-c++ gcc
@@ -321,6 +319,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %endif
 
 %changelog
+* 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 
 
diff --git a/sources b/sources
index affa651..b94770f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
-SHA512 (doxygen-1.9.4.src.tar.gz) = 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a
+SHA512 (doxygen-1.9.5.src.tar.gz) = 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651