diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2016-09-13 10:07:43 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2016-09-13 10:07:43 +0300 |
| commit | b8c999c07d679ab34e43a087a9c8fc17f490be29 (patch) | |
| tree | b6e92f9d6084737896db8141adbeec932c98c6aa /app-doc/doxygen/files | |
| parent | aa257bfff7efcac04cd7f7d6d438b7ea668e5c4b (diff) | |
doxygen: copy from gentoo with disabled libiconv check which is for some reason failed on MY system
Diffstat (limited to 'app-doc/doxygen/files')
| -rw-r--r-- | app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch | 32 | ||||
| -rw-r--r-- | app-doc/doxygen/files/iconv.patch | 13 |
2 files changed, 45 insertions, 0 deletions
diff --git a/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch new file mode 100644 index 0000000..cdc630c --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.11-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/iconv.patch b/app-doc/doxygen/files/iconv.patch new file mode 100644 index 0000000..ed46f6e --- /dev/null +++ b/app-doc/doxygen/files/iconv.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake +index a30f1fd..2fca1f6 100644 +--- a/cmake/FindIconv.cmake ++++ b/cmake/FindIconv.cmake +@@ -128,8 +128,6 @@ endif() + + if(NOT ICONV_ACCEPTS_CONST_INPUT AND NOT ICONV_ACCEPTS_NONCONST_INPUT) + MESSAGE(FATAL_ERROR "Unable to determine iconv() signature") +-elseif(ICONV_ACCEPTS_CONST_INPUT AND ICONV_ACCEPTS_NONCONST_INPUT) +- MESSAGE(FATAL_ERROR "Unable to determine iconv() signature - both test cases passed!") + endif() + + mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR) |