0e4f32b949
- reset pkgrel to 1 - update the CMake patch - re-enable Clang support - add missing build dependencies (clang-tools-extra and polly) - update optional Qt dependency to Qt5 - use the tarball from the official website instead of GitHub - fix LLVM-NOTFOUND in some generated makefiles
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
--- doxygen-1.8.12/addon/doxysearch/CMakeLists.txt.orig 2016-11-04 00:16:18.538177200 -0400
|
|
+++ doxygen-1.8.12/addon/doxysearch/CMakeLists.txt 2016-11-04 00:16:58.765793800 -0400
|
|
@@ -3,7 +3,7 @@
|
|
find_package(Xapian REQUIRED)
|
|
find_package(ZLIB REQUIRED)
|
|
|
|
-if (WIN32)
|
|
+if (WIN32 AND NOT(MINGW))
|
|
set(WIN_EXTRA_LIBS "uuid.lib rpcrt4.lib ws2_32.lib")
|
|
endif()
|
|
|
|
--- doxygen-Release_1_8_14/cmake/FindIconv.cmake.orig 2018-04-12 06:11:12.190369200 -0400
|
|
+++ doxygen-Release_1_8_14/cmake/FindIconv.cmake 2018-04-12 06:35:53.127797200 -0400
|
|
@@ -79,7 +79,7 @@ endif()
|
|
check_cxx_source_compiles(
|
|
"#include <iconv.h>
|
|
int main() {
|
|
- iconv(iconv_t(-1), 0, 0, 0, 0);
|
|
+ iconv((iconv_t)-1, 0, 0, 0, 0);
|
|
}"
|
|
ICONV_COMPILES)
|
|
|
|
@@ -108,7 +108,7 @@ if(ICONV_FOUND)
|
|
"#include <iconv.h>
|
|
int main() {
|
|
char *p = 0;
|
|
- iconv(iconv_t(-1), &p, 0, 0, 0);
|
|
+ iconv((iconv_t)-1, &p, 0, 0, 0);
|
|
}"
|
|
ICONV_ACCEPTS_NONCONST_INPUT)
|
|
|
|
@@ -116,7 +116,7 @@ if(ICONV_FOUND)
|
|
"#include <iconv.h>
|
|
int main() {
|
|
char const *p = 0;
|
|
- iconv(iconv_t(-1), &p, 0, 0, 0);
|
|
+ iconv((iconv_t)-1, &p, 0, 0, 0);
|
|
}"
|
|
ICONV_ACCEPTS_CONST_INPUT)
|
|
|
|
--- doxygen-Release_1_8_14/CMakeLists.txt.orig 2017-12-25 11:26:10.000000000 -0500
|
|
+++ doxygen-Release_1_8_14/CMakeLists.txt 2018-04-12 06:47:49.952617600 -0400
|
|
@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM MATCHES "Darwin")
|
|
set(EXTRA_LIBS ${CORESERVICES_LIB})
|
|
endif()
|
|
|
|
-if (WIN32)
|
|
+if (WIN32 AND MSVC)
|
|
if (NOT CMAKE_GENERATOR MATCHES "MinGW Makefiles")
|
|
if (NOT ICONV_DIR)
|
|
set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
|
|
@@ -121,7 +121,7 @@ else ()
|
|
endif()
|
|
set(LANG_CODES ${lcodes} CACHE STRING "List of language codes for which translations should be compiled in")
|
|
|
|
-if (win_static)
|
|
+if (win_static AND MSVC)
|
|
set(CompilerFlags
|
|
CMAKE_CXX_FLAGS
|
|
CMAKE_CXX_FLAGS_DEBUG
|
|
|
|
--- doxygen-1.8.14/src/CMakeLists.txt.orig 2017-10-31 17:36:00.000000000 -0200
|
|
+++ doxygen-1.8.14/src/CMakeLists.txt 2018-04-22 04:38:33.575840700 -0300
|
|
@@ -262,7 +262,7 @@
|
|
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 ${llvm_libs} CACHE INTERNAL "")
|
|
endif()
|
|
|
|
target_link_libraries(doxygen
|