guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

09/10: gnu: doxygen: Fix build with GCC-12.


From: guix-commits
Subject: 09/10: gnu: doxygen: Fix build with GCC-12.
Date: Thu, 1 Sep 2022 17:44:51 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit d5a122921a7740d1541221eb04974d7f86ec7493
Author: Greg Hogan <code@greghogan.com>
AuthorDate: Thu Jul 28 20:25:28 2022 +0000

    gnu: doxygen: Fix build with GCC-12.
    
    * gnu/packages/patches/doxygen-support-gcc-12.patch: New file.
    * gnu/local.mk: Add it.
    * gnu/packages/documentation.scm (doxygen)[source]: Add patch.
    
    Signed-off-by: Marius Bakke <marius@gnu.org>
---
 gnu/local.mk                                      |  1 +
 gnu/packages/documentation.scm                    |  4 +++-
 gnu/packages/patches/doxygen-support-gcc-12.patch | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index fbb73e2ac5..ebc3bc11be 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1014,6 +1014,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/doc++-include-directives.patch          \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
+  %D%/packages/patches/doxygen-support-gcc-12.patch            \
   %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch     \
   %D%/packages/patches/dstat-skip-devices-without-io.patch     \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index ab54041320..180b556cbf 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -198,7 +198,9 @@ markup) can be customized and extended by the user.")
                                         ".src.tar.gz")))
               (sha256
                (base32
-                "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"))))
+                "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"))
+              ;; Remove with next release.
+              (patches (search-patches "doxygen-support-gcc-12.patch"))))
     (build-system cmake-build-system)
     (native-inputs
      (list bison
diff --git a/gnu/packages/patches/doxygen-support-gcc-12.patch 
b/gnu/packages/patches/doxygen-support-gcc-12.patch
new file mode 100644
index 0000000000..01f5040dde
--- /dev/null
+++ b/gnu/packages/patches/doxygen-support-gcc-12.patch
@@ -0,0 +1,15 @@
+Fix for https://github.com/doxygen/doxygen/issues/9312 made in unreleased 
upstream commit
+https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa
+
+diff --git a/src/cache.h b/src/cache.h
+index 0ff3092ed5..e218eb27d2 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]