Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
Date: Wed, 15 Sep 2021 22:03:23
Message-Id: 1631743365.bc6813534a01bb4eb0dd15442672af080a48ac12.chewi@gentoo
1 commit: bc6813534a01bb4eb0dd15442672af080a48ac12
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 15 22:02:45 2021 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 15 22:02:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc681353
7
8 app-doc/doxygen: Patch to add missing header dependency for 1.9.1
9
10 It was failing to build with Ninja, but only on m68k for some bizarre
11 reason. Probably just luck.
12
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14
15 app-doc/doxygen/doxygen-1.9.1.ebuild | 1 +
16 app-doc/doxygen/doxygen-9999.ebuild | 1 +
17 .../doxygen/files/doxygen-1.9.1-header-dep.patch | 25 ++++++++++++++++++++++
18 3 files changed, 27 insertions(+)
19
20 diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
21 index feb75a0f08a..836656783af 100644
22 --- a/app-doc/doxygen/doxygen-1.9.1.ebuild
23 +++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
24 @@ -59,6 +59,7 @@ PATCHES=(
25 "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
26 "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
27 "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
28 + "${FILESDIR}/${PN}-1.9.1-header-dep.patch"
29 )
30
31 DOCS=( LANGUAGE.HOWTO README.md )
32
33 diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
34 index 16ef846e3b6..4ab0c394c06 100644
35 --- a/app-doc/doxygen/doxygen-9999.ebuild
36 +++ b/app-doc/doxygen/doxygen-9999.ebuild
37 @@ -59,6 +59,7 @@ PATCHES=(
38 "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
39 "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
40 "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
41 + "${FILESDIR}/${PN}-1.9.1-header-dep.patch"
42 )
43
44 DOCS=( LANGUAGE.HOWTO README.md )
45
46 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
47 new file mode 100644
48 index 00000000000..66e647cf53b
49 --- /dev/null
50 +++ b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
51 @@ -0,0 +1,25 @@
52 +From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001
53 +From: James Le Cuirot <chewi@g.o>
54 +Date: Tue, 14 Sep 2021 20:56:20 +0100
55 +Subject: [PATCH] Fix missing dependency on configvalues.h
56 +
57 +It's referenced by config.h, which is referenced by most things.
58 +
59 +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.
60 +
61 +---
62 + src/CMakeLists.txt | 1 +
63 + 1 file changed, 1 insertion(+)
64 +
65 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
66 +index 18406488dd..0e0c5f78de 100644
67 +--- a/src/CMakeLists.txt
68 ++++ b/src/CMakeLists.txt
69 +@@ -215,6 +215,7 @@ add_library(doxymain STATIC
70 + ${GENERATED_SRC}/ce_parse.cpp
71 + # custom generated files
72 + ${GENERATED_SRC}/lang_cfg.h
73 ++ ${GENERATED_SRC}/configvalues.h
74 + ${GENERATED_SRC}/ce_parse.h
75 + ${GENERATED_SRC}/resources.cpp
76 + #