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 CD63F138334 for ; Tue, 2 Oct 2018 02:14:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91E8AE0AA5; Tue, 2 Oct 2018 02:14:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50289E0AA5 for ; Tue, 2 Oct 2018 02:14:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93F2B33BE65 for ; Tue, 2 Oct 2018 02:14:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68F5A42F for ; Tue, 2 Oct 2018 02:14:28 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1538446431.4126e1d5bc12eddbbafaab0e2fb6530526170500.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-1.8.14-r1.ebuild app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch X-VCS-Directories: app-doc/doxygen/files/ app-doc/doxygen/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 4126e1d5bc12eddbbafaab0e2fb6530526170500 X-VCS-Branch: master Date: Tue, 2 Oct 2018 02:14:28 +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-Archives-Salt: dd1d13bf-6196-4147-bf9c-aa9f37082793 X-Archives-Hash: 85f94afb93c58bf2f9cace4903f36054 commit: 4126e1d5bc12eddbbafaab0e2fb6530526170500 Author: Matthias Maier gentoo org> AuthorDate: Tue Oct 2 02:10:59 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Tue Oct 2 02:13:51 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4126e1d5 app-doc/doxygen: apply llvm patches, fix subslot - apply llvm patches, thanks to Stephen Newell for the patch. - add missing subslot operator Closes: https://bugs.gentoo.org/666692 Closes: https://bugs.gentoo.org/657556 Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Matthias Maier gentoo.org> app-doc/doxygen/doxygen-1.8.14-r1.ebuild | 5 +++-- app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch | 25 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild index 4c7544e0532..dce8fc8f3c8 100644 --- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild +++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ RDEPEND="app-text/ghostscript-gpl media-gfx/graphviz media-libs/freetype ) - doxysearch? ( dev-libs/xapian ) + doxysearch? ( dev-libs/xapian:= ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra @@ -59,6 +59,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692 ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch new file mode 100644 index 00000000000..86e6d799941 --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch @@ -0,0 +1,25 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5c55efae..1ad32b2e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -262,7 +262,7 @@ if (use_libclang) + add_definitions(${LLVM_DEFINITIONS}) + llvm_map_components_to_libnames(llvm_libs support core option) + target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) +- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) ++ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) + endif() + + target_link_libraries(doxygen +diff --git a/src/clangparser.cpp b/src/clangparser.cpp +index 77151d6e..2ea15ee2 100644 +--- a/src/clangparser.cpp ++++ b/src/clangparser.cpp +@@ -4,6 +4,7 @@ + + #if USE_LIBCLANG + #include ++#include "clang/Tooling/CompilationDatabase.h" + #include "clang/Tooling/Tooling.h" + #include + #include