From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 54BFA158092 for ; Wed, 15 Sep 2021 22:03:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CE59E0822; Wed, 15 Sep 2021 22:03:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54EE8E0822 for ; Wed, 15 Sep 2021 22:03:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA14E342C45 for ; Wed, 15 Sep 2021 22:03:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28C6A55 for ; Wed, 15 Sep 2021 22:03:19 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1631743365.bc6813534a01bb4eb0dd15442672af080a48ac12.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-1.9.1.ebuild app-doc/doxygen/doxygen-9999.ebuild app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch X-VCS-Directories: app-doc/doxygen/ app-doc/doxygen/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: bc6813534a01bb4eb0dd15442672af080a48ac12 X-VCS-Branch: master Date: Wed, 15 Sep 2021 22:03:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34f93012-e2ec-4fb8-9b22-063c989d1de7 X-Archives-Hash: 35e6ec91f275b1f0798bd692a3f1827f commit: bc6813534a01bb4eb0dd15442672af080a48ac12 Author: James Le Cuirot gentoo org> AuthorDate: Wed Sep 15 22:02:45 2021 +0000 Commit: James Le Cuirot gentoo 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 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 +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 + #