Accepting request 819443 from home:fsirl:doxygen-libclang

- Improve build with libclang support:
  * add doxygen-libclang-cpp.patch to support linking against libclang-cpp
  * add upstream doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch
    to support clang-10

OBS-URL: https://build.opensuse.org/request/show/819443
OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=148

doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch

@@ -0,0 +1,24 @@
+From 64f1f2357ae764f2c8190d067aff801bc0a56721 Mon Sep 17 00:00:00 2001
+From: Eric Niebler <eniebler@boost.org>
+Date: Tue, 10 Sep 2019 10:48:55 -0700
+Subject: [PATCH] Latest libclang needs C++14
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7aa1c01fc..2644ceb49 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,8 +49,8 @@ if (use_libclang)
+     endif()
+ endif()
+ 
+-# use C++11 standard for compiling (libclang option requires it)
+-set(CMAKE_CXX_STANDARD 11)
++# use C++14 standard for compiling (libclang option requires it)
++set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS ON)
+ 

doxygen-libclang-cpp.patch

@@ -0,0 +1,33 @@
+--- doxygen-1.8.16/addon/doxyapp/CMakeLists.txt~	2020-07-07 16:52:25.526347653 +0200
++++ doxygen-1.8.16/addon/doxyapp/CMakeLists.txt	2020-07-07 17:07:15.382642253 +0200
+@@ -14,7 +14,7 @@
+ )
+ 
+ if (use_libclang)
+-    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
+ endif()
+ 
+ target_link_libraries(doxyapp
+--- doxygen-1.8.16/addon/doxyparse/CMakeLists.txt~	2020-07-07 16:52:25.526347653 +0200
++++ doxygen-1.8.16/addon/doxyparse/CMakeLists.txt	2020-07-07 17:07:38.729600748 +0200
+@@ -14,7 +14,7 @@
+ )
+ 
+ if (use_libclang)
+-    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
+ endif()
+ 
+ target_link_libraries(doxyparse
+--- doxygen-1.8.16/src/CMakeLists.txt~	2020-07-07 16:52:25.538347118 +0200
++++ doxygen-1.8.16/src/CMakeLists.txt	2020-07-07 17:08:18.567823582 +0200
+@@ -269,7 +269,7 @@
+     include_directories(${LLVM_INCLUDE_DIRS})
+     add_definitions(${LLVM_DEFINITIONS})
+     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
+-    set(CLANG_LIBS libclang clangTooling LLVM)
++    set(CLANG_LIBS libclang clang-cpp LLVM)
+ endif()
+ 
+ target_link_libraries(doxygen

doxygen.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul  8 07:53:57 UTC 2020 - Franz Sirl <franz.sirl-obs@lauterbach.com>
+
+- Improve build with libclang support:
+  * add doxygen-libclang-cpp.patch to support linking against libclang-cpp
+  * add upstream doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch
+    to support clang-10
+
 -------------------------------------------------------------------
 Wed Jan 22 17:31:41 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
 

doxygen.spec

@@ -41,6 +41,8 @@ Patch7:         PR_7193_fix_blank_file_patterns.patch
 # PATCH-FIX-UPSTREAM Including external tag files with TOC produces a broken index.qhp
 Patch8:         0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch
 Patch9:         reproducible-sort.patch
+Patch10:        doxygen-libclang-cpp.patch
+Patch11:        doxygen-64f1f2357ae764f2c8190d067aff801bc0a56721.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  flex
@@ -74,6 +76,14 @@ as well.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%if %{with libclang}
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
+%patch10 -p1
+%endif
+%if 0%{?suse_version} > 1500
+%patch11 -p1
+%endif
+%endif
 
 %build
 %cmake \