fix: address PR review comments and fix remaining CI failures

- Replace broken patch file with replace_in_file() in conanfile.py for
  the musl strerror_r fix — patch-ng context lines were at wrong offset;
  replace_in_file does an exact string search and is more robust
- Add #include <Corrade/Containers/StringStl.h> to AbstractPlugin.cpp
  and Policies.cpp — both use std::string(plugin()) / std::string(StringView)
  but were missing the header that provides the STL interop conversion

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: leoparente

conan/corrade/conandata.yml

@@ -2,9 +2,3 @@ sources:
   "cci.20260327":
     sha256: d8f30e9a857172003b6b02304783f40e8038c36e4127a0cfec7fe14f41c13fd4
     url: https://github.com/mosra/corrade/archive/22e7ffc6fcdeaa0df96e0d8b3d482ad6abe7dc36.tar.gz
-
-patches:
-  "cci.20260327":
-    - patch_file: "patches/0001-fix-strerror_r-musl-compat.patch"
-      patch_description: "Fix strerror_r usage for non-glibc Linux (musl): always use POSIX XSI variant"
-      patch_type: "portability"

conan/corrade/conanfile.py

@@ -4,7 +4,7 @@
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import cross_building
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rmdir
 from conan.tools.microsoft import is_msvc, check_min_vs
 
 required_conan_version = ">=2.0"
@@ -71,6 +71,15 @@ def build_requirements(self):
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
+        # Fix strerror_r for non-glibc Linux (e.g. musl): always use POSIX XSI variant.
+        # GCC defines _GNU_SOURCE on Linux even for musl targets, so Corrade's preprocessor
+        # condition falls into the GNU branch (char* strerror_r) which musl doesn't provide.
+        replace_in_file(
+            self,
+            os.path.join(self.source_folder, "src/Corrade/Utility/Implementation/ErrorString.cpp"),
+            "#if ((_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE) || defined(CORRADE_TARGET_EMSCRIPTEN) || defined(CORRADE_TARGET_APPLE) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)",
+            "#if ((_POSIX_C_SOURCE >= 200112L) && !_GNU_SOURCE) || defined(CORRADE_TARGET_EMSCRIPTEN) || defined(CORRADE_TARGET_APPLE) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || (defined(__linux__) && !defined(__GLIBC__))",
+        )
 
     def generate(self):
         tc = CMakeToolchain(self)

conan/corrade/patches/0001-fix-strerror_r-musl-compat.patch

@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "AbstractPlugin.h"
+#include <Corrade/Containers/StringStl.h>
 #include <fmt/format.h>
 #include <regex>
 

src/AbstractPlugin.cpp

@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "Policies.h"
+#include <Corrade/Containers/StringStl.h>
 #include "CoreRegistry.h"
 #include "HandlerManager.h"
 #include "InputStreamManager.h"