| 1 |
commit: 4126e1d5bc12eddbbafaab0e2fb6530526170500 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 2 02:10:59 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 2 02:13:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4126e1d5 |
| 7 |
|
| 8 |
app-doc/doxygen: apply llvm patches, fix subslot |
| 9 |
|
| 10 |
- apply llvm patches, thanks to Stephen Newell for the patch. |
| 11 |
- add missing subslot operator |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/666692 |
| 14 |
Closes: https://bugs.gentoo.org/657556 |
| 15 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 16 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 17 |
|
| 18 |
app-doc/doxygen/doxygen-1.8.14-r1.ebuild | 5 +++-- |
| 19 |
app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch | 25 ++++++++++++++++++++++++ |
| 20 |
2 files changed, 28 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild |
| 23 |
index 4c7544e0532..dce8fc8f3c8 100644 |
| 24 |
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild |
| 25 |
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2018 Gentoo Foundation |
| 28 |
+# Copyright 1999-2018 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -30,7 +30,7 @@ RDEPEND="app-text/ghostscript-gpl |
| 33 |
media-gfx/graphviz |
| 34 |
media-libs/freetype |
| 35 |
) |
| 36 |
- doxysearch? ( dev-libs/xapian ) |
| 37 |
+ doxysearch? ( dev-libs/xapian:= ) |
| 38 |
latex? ( |
| 39 |
dev-texlive/texlive-bibtexextra |
| 40 |
dev-texlive/texlive-fontsextra |
| 41 |
@@ -59,6 +59,7 @@ RESTRICT="test" |
| 42 |
PATCHES=( |
| 43 |
"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 |
| 44 |
"${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" |
| 45 |
+ "${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692 |
| 46 |
) |
| 47 |
|
| 48 |
DOCS=( LANGUAGE.HOWTO README.md ) |
| 49 |
|
| 50 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..86e6d799941 |
| 53 |
--- /dev/null |
| 54 |
+++ b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch |
| 55 |
@@ -0,0 +1,25 @@ |
| 56 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 57 |
+index 5c55efae..1ad32b2e 100644 |
| 58 |
+--- a/src/CMakeLists.txt |
| 59 |
++++ b/src/CMakeLists.txt |
| 60 |
+@@ -262,7 +262,7 @@ if (use_libclang) |
| 61 |
+ add_definitions(${LLVM_DEFINITIONS}) |
| 62 |
+ llvm_map_components_to_libnames(llvm_libs support core option) |
| 63 |
+ target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) |
| 64 |
+- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) |
| 65 |
++ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) |
| 66 |
+ endif() |
| 67 |
+ |
| 68 |
+ target_link_libraries(doxygen |
| 69 |
+diff --git a/src/clangparser.cpp b/src/clangparser.cpp |
| 70 |
+index 77151d6e..2ea15ee2 100644 |
| 71 |
+--- a/src/clangparser.cpp |
| 72 |
++++ b/src/clangparser.cpp |
| 73 |
+@@ -4,6 +4,7 @@ |
| 74 |
+ |
| 75 |
+ #if USE_LIBCLANG |
| 76 |
+ #include <clang-c/Index.h> |
| 77 |
++#include "clang/Tooling/CompilationDatabase.h" |
| 78 |
+ #include "clang/Tooling/Tooling.h" |
| 79 |
+ #include <qfileinfo.h> |
| 80 |
+ #include <stdlib.h> |
Archives