diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
| commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
| tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /app-doc/doxygen/files | |
| parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) | |
gentoo resync : 07.10.2018
Diffstat (limited to 'app-doc/doxygen/files')
| -rw-r--r-- | app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch | 24 | ||||
| -rw-r--r-- | app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch | 25 |
2 files changed, 25 insertions, 24 deletions
diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch deleted file mode 100644 index 8d72e8ff6e0d..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001 -From: albert-github <albert.tests@gmail.com> -Date: Wed, 4 Jan 2017 12:24:55 +0100 -Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the - breathe docs - -Protected against NULL pointer of variable al ---- - src/xmlgen.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp -index fe95c7a..70e198a 100644 ---- a/src/xmlgen.cpp -+++ b/src/xmlgen.cpp -@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De - if (md->isInline()) t << "yes"; else t << "no"; - t << "\""; - -- if (al->refQualifier!=RefQualifierNone) -+ if (al!=0 && al->refQualifier!=RefQualifierNone) - { - t << " refqual=\""; - if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue"; 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 000000000000..86e6d7999418 --- /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 <clang-c/Index.h> ++#include "clang/Tooling/CompilationDatabase.h" + #include "clang/Tooling/Tooling.h" + #include <qfileinfo.h> + #include <stdlib.h> |