From fd3dde77905b1b1890df3c8daa496d9b2fe44f7f Mon Sep 17 00:00:00 2001
From: SunBlack <SunBlack@users.noreply.github.com>
Date: Wed, 29 Jul 2026 21:45:58 +0200
Subject: [PATCH] [iceoryx] Update to 2.0.8 (#52806)

---
 ports/iceoryx/add-include-chrono.patch | 12 ------------
 ports/iceoryx/portfile.cmake           | 15 +++++++++++++--
 ports/iceoryx/vcpkg.json               |  5 ++---
 scripts/ci.baseline.txt                |  3 ---
 versions/baseline.json                 |  4 ++--
 versions/i-/iceoryx.json               |  5 +++++
 6 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 ports/iceoryx/add-include-chrono.patch

diff --git a/ports/iceoryx/add-include-chrono.patch b/ports/iceoryx/add-include-chrono.patch
deleted file mode 100644
index eaf03f08c9..0000000000
--- a/ports/iceoryx/add-include-chrono.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/iceoryx_hoofs/platform/win/source/time.cpp b/iceoryx_hoofs/platform/win/source/time.cpp
-index 4c2ab2d..4a7074b 100644
---- a/iceoryx_hoofs/platform/win/source/time.cpp
-+++ b/iceoryx_hoofs/platform/win/source/time.cpp
-@@ -16,6 +16,7 @@
- // SPDX-License-Identifier: Apache-2.0
- 
- #include "iceoryx_hoofs/platform/time.hpp"
-+#include <chrono>
- 
- static std::chrono::nanoseconds getNanoSeconds(const timespec& value)
- {
diff --git a/ports/iceoryx/portfile.cmake b/ports/iceoryx/portfile.cmake
index 9ca801f91f..6e1e73f05e 100644
--- a/ports/iceoryx/portfile.cmake
+++ b/ports/iceoryx/portfile.cmake
@@ -6,11 +6,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse-iceoryx/iceoryx
     REF "v${VERSION}"
-    SHA512 708c113f8b4e5a23830172cd67414cb6fa389f9bc34a5979b27131c3180d6758ca50257baa86cb6f74bcff71b24237cffc0e697964a7c0326e9018fbf7885c09
+    SHA512 e42558948f7c2eda3c17f9d6756aa60dba3e6009cbe7b8a8c7b1d66b71f43594c8a3c0543867cb496c25683950a8e1e5ec9e557644550394899293a621233ab4
     HEAD_REF master
     PATCHES
         acl.patch
-        add-include-chrono.patch # https://github.com/eclipse-iceoryx/iceoryx/pull/2378
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -31,12 +30,24 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_binding_c CONFIG_PATH lib/cmake/ic
 vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_hoofs CONFIG_PATH lib/cmake/iceoryx_hoofs DO_NOT_DELETE_PARENT_CONFIG_PATH)
 vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_posh CONFIG_PATH lib/cmake/iceoryx_posh)
 
+if(TOML_CONFIG)
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/share/iceoryx_posh/iceoryx_poshConfig.cmake"
+        "find_dependency(iceoryx_hoofs)"
+        "find_dependency(iceoryx_hoofs)\nfind_dependency(cpptoml CONFIG)"
+    )
+endif()
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
     "${CURRENT_PACKAGES_DIR}/share/doc"
 )
 
+if(EXISTS "${CURRENT_PACKAGES_DIR}/include/iceoryx/v${VERSION}")
+    file(COPY "${CURRENT_PACKAGES_DIR}/include/iceoryx/v${VERSION}/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+endif()
+
 if(TOML_CONFIG)
     vcpkg_copy_tools(TOOL_NAMES iox-roudi AUTO_CLEAN)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc")
diff --git a/ports/iceoryx/vcpkg.json b/ports/iceoryx/vcpkg.json
index 57ae5f5b17..0c4890f0c7 100644
--- a/ports/iceoryx/vcpkg.json
+++ b/ports/iceoryx/vcpkg.json
@@ -1,11 +1,10 @@
 {
   "name": "iceoryx",
-  "version": "2.0.6",
-  "port-version": 1,
+  "version": "2.0.8",
   "description": "True zero-copy inter-process-communication",
   "homepage": "https://iceoryx.io",
   "license": "Apache-2.0",
-  "supports": "!uwp",
+  "supports": "!uwp & !android",
   "dependencies": [
     {
       "name": "acl",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 9ec40d4b8a..ee220516a2 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -238,9 +238,6 @@ halide:x64-windows-static=fail
 hwloc:arm-neon-android=fail
 hwloc:arm64-android=fail
 hwloc:x64-android=fail
-iceoryx:arm-neon-android=fail
-iceoryx:arm64-android=fail
-iceoryx:x64-android=fail
 igraph:arm64-linux=fail
 ijg-libjpeg:arm64-linux=skip
 imcce-openfa:arm64-linux=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index aace5b5dd6..fd0fa99534 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3929,8 +3929,8 @@
       "port-version": 0
     },
     "iceoryx": {
-      "baseline": "2.0.6",
-      "port-version": 1
+      "baseline": "2.0.8",
+      "port-version": 0
     },
     "icey": {
       "baseline": "2.4.11",
diff --git a/versions/i-/iceoryx.json b/versions/i-/iceoryx.json
index d19c09f98c..39a63e666f 100644
--- a/versions/i-/iceoryx.json
+++ b/versions/i-/iceoryx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "16efdefcb13a3b7d913abe8953a09029fbad0087",
+      "version": "2.0.8",
+      "port-version": 0
+    },
     {
       "git-tree": "cc0edf5362f2ad323fbc30d0610971e5fb376b2b",
       "version": "2.0.6",