From f5b40fcbf7c57a2ca070ff37bf4699498f99f506 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Tue, 23 Jan 2024 20:48:09 +0200
Subject: [PATCH] kcov: fix another missing include in macOS system headers

---
 recipes/kcov/all/conandata.yml                |  4 ++--
 .../patches/0003-fix-missing-include.patch    | 20 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/recipes/kcov/all/conandata.yml b/recipes/kcov/all/conandata.yml
index 06ab66477c547..0e7a8992fbe47 100644
--- a/recipes/kcov/all/conandata.yml
+++ b/recipes/kcov/all/conandata.yml
@@ -11,8 +11,8 @@ sources:
 patches:
   "42":
     - patch_file: "patches/0003-fix-missing-include.patch"
-      patch_description: "Add a missing #include <assert.h>"
-      patch_type: "bugfix"
+      patch_description: "Add a missing includes on macOS"
+      patch_type: "backport"
     - patch_file: "patches/0004-fix-libdwarf-prefix.patch"
       patch_description: "Adjust libdwarf include to match CCI includedirs"
       patch_type: "conan"
diff --git a/recipes/kcov/all/patches/0003-fix-missing-include.patch b/recipes/kcov/all/patches/0003-fix-missing-include.patch
index 579725ea87937..49167148ac3b4 100644
--- a/recipes/kcov/all/patches/0003-fix-missing-include.patch
+++ b/recipes/kcov/all/patches/0003-fix-missing-include.patch
@@ -1,10 +1,20 @@
+Use updated includes from master to fix a missing <cassert> and <sys/types.h>
+https://github.com/SimonKagstrom/kcov/blob/1d036f7799f95fed025c5fa0665c19df38632ab4/src/engines/mach-engine.cc
+
 --- src/engines/mach-engine.cc
 +++ src/engines/mach-engine.cc
-@@ -30,6 +30,7 @@
+@@ -26,7 +26,14 @@
+ #include <set>
+ #include <signal.h>
+ #include <spawn.h>
++#include <sys/errno.h>
++// clang-format off
++// sys/ptrace.h needs sys/types.h, so make sure clang-format doesn't change the order
++#include <sys/types.h>
+ #include <sys/ptrace.h>
++// clang-format on
++#include <cassert>
++#include <iostream>
  #include <unistd.h>
  #include <unordered_map>
  #include <utils.hh>
-+#include <assert.h>
- 
- using namespace kcov;
- extern char** environ;