[doxygen] Add Version 1.9.5 and bump dependency versions

recipes/doxygen/all/conandata.yml

@@ -20,16 +20,21 @@ sources:
 patches:
   "1.9.2":
     - patch_file: "patches/1.9.2-0001-imported-target.patch"
-      base_path: "source_subfolder"
+      patch_description: "Fix includes"
+      patch_type: "portability"
   "1.9.1":
     - patch_file: "patches/1.9.1-0001-imported-target.patch"
-      base_path: "source_subfolder"
+      patch_description: "Fix includes"
+      patch_type: "portability"
   "1.8.20":
-    - patch_file: "patches/1.8.20-0001-relocatable-cmake.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/1.8-0001-xapian.patch"
+      patch_description: "Fix xapian find_package command"
+      patch_type: "portability"
   "1.8.18":
-    - patch_file: "patches/1.8.18-0001-relocatable-cmake.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/1.8-0001-xapian.patch"
+      patch_description: "Fix xapian find_package command"
+      patch_type: "portability"
   "1.8.17":
-    - patch_file: "patches/1.8.17-0001-relocatable-cmake.patch"
-      base_path: "source_subfolder"
+    - patch_file: "patches/1.8-0001-xapian.patch"
+      patch_description: "Fix xapian find_package command"
+      patch_type: "portability"

recipes/doxygen/all/conanfile.py

@@ -1,7 +1,8 @@
 from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import apply_conandata_patches, export_conandata_patches, get
+from conan.tools.microsoft import is_msvc_static_runtime
 from conan.tools.scm import Version
-from conan import tools
-from conans import CMake
 from conan.errors import ConanInvalidConfiguration
 import os
 
@@ -25,23 +26,11 @@ class DoxygenConan(ConanFile):
         "enable_search": True,
     }
 
-    exports_sources = "CMakeLists.txt", "patches/*"
-    generators = "cmake", "cmake_find_package"
-    short_paths = True
+    def layout(self):
+        cmake_layout(self, src_folder="src")
 
-    _cmake = None
-
-    @property
-    def _source_subfolder(self):
-        return "source_subfolder"
-
-    @property
-    def _build_subfolder(self):
-        return "build_subfolder"
-
-    @property
-    def _settings_build(self):
-        return getattr(self, "settings_build", self.settings)
+    def export_sources(self):
+        export_conandata_patches(self)
 
     def _minimum_compiler_version(self):
         if Version(self.version) <= "1.9.1":
@@ -55,17 +44,18 @@ def _minimum_compiler_version(self):
 
     def configure(self):
         del self.settings.compiler.cppstd
+
     def requirements(self):
         if self.options.enable_search:
             self.requires("xapian-core/1.4.19")
-            self.requires("zlib/1.2.12")
+            self.requires("zlib/1.2.13")
 
     def build_requirements(self):
-        if self._settings_build.os == "Windows":
-            self.build_requires("winflexbison/2.5.24")
+        if self.settings.os == "Windows":
+            self.tool_requires("winflexbison/2.5.24")
         else:
-            self.build_requires("flex/2.6.4")
-            self.build_requires("bison/3.7.1")
+            self.tool_requires("flex/2.6.4")
+            self.tool_requires("bison/3.8.2")
 
     def validate(self):
         minimum_compiler_version = self._minimum_compiler_version()
@@ -82,39 +72,36 @@ def package_id(self):
 
         # Doxygen doesn't make code. Any package that will run is ok to use.
         # It's ok in general to use a release version of the tool that matches the
-        # build os and architecture.
         compatible_pkg = self.info.clone()
         compatible_pkg.settings.build_type = "Release"
         self.compatible_packages.append(compatible_pkg)
 
     def source(self):
-        tools.files.get(self, **self.conan_data["sources"][self.version],
-                  destination=self._source_subfolder, strip_root=True)
-
-    def _configure_cmake(self):
-        if self._cmake:
-            return self._cmake
-        self._cmake = CMake(self)
-        self._cmake.definitions["build_parse"] = self.options.enable_parse
-        self._cmake.definitions["build_search"] = self.options.enable_search
-        self._cmake.definitions["use_libc++"] = self.settings.compiler.get_safe("libcxx") == "libc++"
-        self._cmake.definitions["win_static"] = "MT" in self.settings.compiler.get_safe("runtime", "")
-        self._cmake.configure(build_folder=self._build_subfolder)
-        return self._cmake
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.variables["build_parse"] = self.options.enable_parse
+        tc.variables["build_search"] = self.options.enable_search
+        tc.variables["use_libc++"] = self.settings.compiler.get_safe("libcxx") == "libc++"
+        tc.variables["win_static"] = is_msvc_static_runtime(self)
+        tc.generate()
+
+        deps = CMakeDeps(self)
+        # if self.settings.os != "Windows":
+        #    deps.set_property("flex", "cmake_find_mode", "none", build_context=True)
+        #    deps.set_property("bison", "cmake_find_mode", "none", build_context=True)
+        deps.generate()
 
     def build(self):
-        if os.path.isfile("Findflex.cmake"):
-            os.unlink("Findflex.cmake")
-        if os.path.isfile("Findbison.cmake"):
-            os.unlink("Findbison.cmake")
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            tools.files.patch(self, **patch)
-        cmake = self._configure_cmake()
+        apply_conandata_patches(self)
+        cmake = CMake(self)
+        cmake.configure()
         cmake.build()
 
     def package(self):
-        self.copy("LICENSE", src=self._source_subfolder, dst="licenses")
-        cmake = self._configure_cmake()
+        self.copy("LICENSE", src=self.source_folder, dst="licenses")
+        cmake = CMake(self)
         cmake.install()
 
     def package_info(self):
@@ -123,3 +110,4 @@ def package_info(self):
         bin_path = os.path.join(self.package_folder, "bin")
         self.output.info(f"Appending PATH environment variable: {bin_path}")
         self.env_info.PATH.append(bin_path)
+        self.cpp_info.set_property("cmake_find_mode", "none")

recipes/doxygen/all/patches/1.8-0001-xapian.patch

@@ -0,0 +1,13 @@
+--- a/addon/doxysearch/CMakeLists.txt	2020-08-24 13:12:55.000000000 +0200
++++ b/addon/doxysearch/CMakeLists.txt	2022-12-16 20:41:07.040801300 +0100
+@@ -1,8 +1,8 @@
+-find_package(Xapian REQUIRED)
++find_package(xapian REQUIRED)
+ find_package(ZLIB REQUIRED)
+
+ if (WIN32)
+-  set(WIN_EXTRA_LIBS "uuid.lib rpcrt4.lib ws2_32.lib")
++  set(WIN_EXTRA_LIBS uuid.lib rpcrt4.lib ws2_32.lib)
+ endif()
+
+ include_directories(