From f9a41fa6e493437004920753143f6db23bbdbd3e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sep 15 2020 14:05:42 +0000
Subject: 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

---

diff --git a/doxygen-different-results-on-64-and-32-bit.patch b/doxygen-different-results-on-64-and-32-bit.patch
new file mode 100644
index 0000000..2167f3b
--- /dev/null
+++ b/doxygen-different-results-on-64-and-32-bit.patch
@@ -0,0 +1,25 @@
+From 1fda77f54a2eacba32658001329bd9084f4df1e7 Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <doxygen@gmail.com>
+Date: Fri, 11 Sep 2020 15:38:01 +0200
+Subject: [PATCH] issue #8022: Different results on 64 and 32 bit
+
+---
+ src/doxygen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/doxygen.cpp b/src/doxygen.cpp
+index b218d382..0832e5c6 100644
+--- a/src/doxygen.cpp
++++ b/src/doxygen.cpp
+@@ -164,7 +164,7 @@ DefinesPerFileList Doxygen::macroDefinitions;
+ bool             Doxygen::clangAssistedParsing = FALSE;
+ 
+ // locally accessible globals
+-static std::unordered_map< std::string, const Entry* > g_classEntries;
++static std::map< std::string, const Entry* > g_classEntries;
+ static StringVector     g_inputFiles;
+ static QDict<void>      g_compoundKeywordDict(7);  // keywords recognised as compounds
+ static OutputList      *g_outputList = 0;          // list of output generating objects
+-- 
+2.26.2
+
diff --git a/doxygen.spec b/doxygen.spec
index 71aa328..78cad06 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -16,7 +16,7 @@ Summary: A documentation system for C/C++
 Name:    doxygen
 Epoch:   1
 Version: 1.8.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # No version is specified.
 License: GPL+
@@ -26,6 +26,7 @@ Source0: http://doxygen.nl/files/%{name}-%{version}.src.tar.gz
 Source1: doxywizard.desktop
 # upstream patches
 Patch0: doxygen-1.8.20-enums-multiple-files.patch
+Patch1: doxygen-different-results-on-64-and-32-bit.patch
 
 BuildRequires: %{_bindir}/python3
 BuildRequires: ImageMagick
@@ -303,6 +304,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %endif
 
 %changelog
+* 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