[gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     bc6813534a01bb4eb0dd15442672af080a48ac12
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 22:02:45 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 22:02:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc681353

app-doc/doxygen: Patch to add missing header dependency for 1.9.1

It was failing to build with Ninja, but only on m68k for some bizarre
reason. Probably just luck.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-doc/doxygen/doxygen-1.9.1.ebuild               |  1 +
 app-doc/doxygen/doxygen-9999.ebuild                |  1 +
 .../doxygen/files/doxygen-1.9.1-header-dep.patch   | 25 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index feb75a0f08a..836656783af 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
 	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
 	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
+	"${FILESDIR}/${PN}-1.9.1-header-dep.patch"
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )

diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 16ef846e3b6..4ab0c394c06 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
 	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
 	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
+	"${FILESDIR}/${PN}-1.9.1-header-dep.patch"
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )

diff --git a/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
new file mode 100644
index 00000000000..66e647cf53b
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
@@ -0,0 +1,25 @@
+From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 14 Sep 2021 20:56:20 +0100
+Subject: [PATCH] Fix missing dependency on configvalues.h
+
+It's referenced by config.h, which is referenced by most things.
+
+This was failing to build for me with Ninja on the m68k Linux platform. I don't know why it works elsewhere, could just be luck.
+
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 18406488dd..0e0c5f78de 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -215,6 +215,7 @@ add_library(doxymain STATIC
+     ${GENERATED_SRC}/ce_parse.cpp
+     # custom generated files
+     ${GENERATED_SRC}/lang_cfg.h
++    ${GENERATED_SRC}/configvalues.h
+     ${GENERATED_SRC}/ce_parse.h
+     ${GENERATED_SRC}/resources.cpp
+     #