diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-doc/doxygen/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-doc/doxygen/files')
3 files changed, 76 insertions, 0 deletions
diff --git a/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch new file mode 100644 index 000000000000..cdc630c4d42b --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch @@ -0,0 +1,32 @@ +diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt +index 33e01c1..165fc3e 100644 +--- a/addon/doxysearch/CMakeLists.txt ++++ b/addon/doxysearch/CMakeLists.txt +@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} + qtools ++ pthread + ) + + add_executable(doxysearch.cgi +@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi + ${XAPIAN_LIBRARIES} + ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} ++ pthread + ) + + install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) +diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt +index bf2eda8..8eb2a1c 100644 +--- a/addon/doxywizard/CMakeLists.txt ++++ b/addon/doxywizard/CMakeLists.txt +@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC} + qt_use_modules(doxywizard Core Gui Widgets Xml) + target_link_libraries(doxywizard + ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ++pthread + ) + + install(TARGETS doxywizard DESTINATION bin) 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 new file mode 100644 index 000000000000..8d72e8ff6e0d --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch @@ -0,0 +1,24 @@ +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.9.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch new file mode 100644 index 000000000000..cfa56174c5eb --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch @@ -0,0 +1,20 @@ +removeEmptyLines() segfaults on empty string + +https://bugs.gentoo.org/show_bug.cgi?id=454348 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423 + +Patch written by Thibaut Paumard <paumard@users.sourceforge.net> +--- a/src/htmlgen.cpp ++++ b/src/htmlgen.cpp +@@ -1022,6 +1022,11 @@ + static QCString removeEmptyLines(const QCString &s) + { + BufStr out(s.length()+1); ++ if (s.length()==0) ++ { ++ out.addChar('\0'); ++ return out.data(); ++ } + const char *p=s.data(); + if (p) + { |