Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1cb83e7827d9dc5e474e898cd8b89acb967820ad)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1cb83e7827d9dc5e474e898cd8b89acb967820ad)
  • Date: Tue, 5 Jul 2022 14:00:14 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

devel/doxygen/HISTORY | 3 +++
devel/doxygen/PRE_BUILD | 15 ++++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 1cb83e7827d9dc5e474e898cd8b89acb967820ad
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

doxygen: fix build with gcc 12

diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 5537d30..1d4e827 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2022-07-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: fix build with GCC 12
+
2022-05-06 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.9.4

diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 4ccc290..3b64a78 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -1,4 +1,17 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
# fix ninja error
-sed -i 's/$(LEX/$$(LEX/;s/$(Y/$$(Y/' src/CMakeLists.txt
addon/doxywizard/CMakeLists.txt
+sed -i 's/$(LEX/$$(LEX/;s/$(Y/$$(Y/' src/CMakeLists.txt
addon/doxywizard/CMakeLists.txt &&
+# Fix gcc12 build error, in upstream git repo.
+patch -p0 <<EOT
+--- src/cache.h.orig 2022-07-05 15:47:22.891263886 +0200
++++ src/cache.h 2022-07-05 15:48:23.026269447 +0200
+@@ -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.
+EOT



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (1cb83e7827d9dc5e474e898cd8b89acb967820ad), Thomas Orgis, 07/05/2022

Archive powered by MHonArc 2.6.24.

Top of Page