(#13713) civetweb: update zlib and use export_conandata_patches

* civetweb: update zlib and use export_conandata_patches

* remove skip-file

Author: toge

recipes/civetweb/all/conanfile.py

@@ -1,11 +1,11 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
-from conan.tools.files import apply_conandata_patches, copy, get, rmdir
+from conan.tools.files import export_conandata_patches, apply_conandata_patches, copy, get, rmdir
 from conan.tools.scm import Version
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 import os
 
-required_conan_version = ">=1.50.2 <1.51.0 || >=1.51.2"
+required_conan_version = ">=1.52.0"
 
 
 class CivetwebConan(ConanFile):
@@ -14,7 +14,7 @@ class CivetwebConan(ConanFile):
     homepage = "https://github.com/civetweb/civetweb"
     url = "https://github.com/conan-io/conan-center-index"
     description = "Embedded C/C++ web server"
-    topics = ("civetweb", "web-server", "embedded")
+    topics = ("web-server", "embedded")
 
     settings = "os", "arch", "compiler", "build_type"
     options = {
@@ -59,8 +59,7 @@ def _has_zlib_option(self):
         return Version(self.version) >= "1.15"
 
     def export_sources(self):
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            copy(self, patch["patch_file"], self.recipe_folder, self.export_sources_folder)
+        export_conandata_patches(self)
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -70,18 +69,27 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            del self.options.fPIC
+            try:
+                del self.options.fPIC
+            except Exception:
+                pass
         if not self.options.with_cxx:
-            del self.settings.compiler.cppstd
-            del self.settings.compiler.libcxx
+            try:
+                del self.settings.compiler.libcxx
+            except Exception:
+                pass
+            try:
+                del self.settings.compiler.cppstd
+            except Exception:
+                pass
         if not self.options.with_ssl:
             del self.options.ssl_dynamic_loading
 
     def requirements(self):
         if self.options.with_ssl:
             self.requires("openssl/1.1.1q")
         if self.options.get_safe("with_zlib"):
-            self.requires("zlib/1.2.12")
+            self.requires("zlib/1.2.13")
 
     def validate(self):
         if self.options.get_safe("ssl_dynamic_loading") and not self.options["openssl"].shared:

recipes/civetweb/all/test_v1_package/conanfile.py

@@ -1,4 +1,3 @@
-# pylint: skip-file
 import os
 from conans import ConanFile, tools, CMake