Drop upstreamed patch.

- CVE: Fix UBSAN issue "bsearch comparator through an incompatible
  function pointer"
- RFC5545 section 3.3.5 Date-Time fixes:
  - Resolve local times in a fall-back overlap to the first occurrence
  - Fix explicit local time in a DST gap resolves using the
    post-transition offset
- RFC5545 section 3.3.10 Recurrence Rule fixes:
  - FREQ=WEEKLY with BYMONTH and BYSETPOS loses occurrences in the week
    straddling month boundary
- libicalvcard: the typed vcardvalue getters now check that the value
  type of the property uses the same union member as the expected value
  type of the getter. If the type mismatches, then they return the zero
  value for the expected value type. The typed setters error with
  ICAL_BADARG_ERROR instead of overwriting a value held in another union
  member.
- libicalvcal: Fixed a memory leak in vobject.c
- Buildsystem changes:
  - Fix build paths in installed cmake files (esp. for cross-compiling)
  - Install the libicalversion.h header
  - Fix building libical as a submodule in a larger CMake project
  - Fix "now" linker support check in the hardening compiler options
  - Fix the DESTINATION path for libical.jar
  - Use private linkage for 3rdparty libraries (icu, glib, ..)
- Built-in timezones updated to tzdata2026e.
- Remove ancient hack (since 2012) to support malformed TZID parameters

Signed-off-by: Ross Burton <[email protected]>
---
 ...001-Mark-ICU-as-private-linkage-1366.patch | 76 -------------------
 .../{libical_4.0.5.bb => libical_4.0.6.bb}    |  6 +-
 2 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 
meta/recipes-support/libical/libical/0001-Mark-ICU-as-private-linkage-1366.patch
 rename meta/recipes-support/libical/{libical_4.0.5.bb => libical_4.0.6.bb} 
(91%)

diff --git 
a/meta/recipes-support/libical/libical/0001-Mark-ICU-as-private-linkage-1366.patch
 
b/meta/recipes-support/libical/libical/0001-Mark-ICU-as-private-linkage-1366.patch
deleted file mode 100644
index 53bd1683af2..00000000000
--- 
a/meta/recipes-support/libical/libical/0001-Mark-ICU-as-private-linkage-1366.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 13642054f650795446f6020d9d2e14d147b8da51 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 2 Sep 2026 16:14:44 +0100
-Subject: [PATCH] Mark ICU as private linkage (#1366)
-
-* libical-glib: Hide some target options in the installed CMake files
-
-The build paths could be shown in the installed .cmake files, thus
-hide them from there, because they are not needed.
-
-Closes https://github.com/libical/libical/issues/532
-
-* libical: mark ICU linkage as private
-
-There's no need to expose the ICU linkage publically as the .so will
-pull this in itself.
-
-This has a side-effect of removing build/sysroot paths from the installed
-.cmake files.
-
-Closes #532.
-
----------
-
-Co-authored-by: Milan Crha <[email protected]>
-(cherry picked from commit 38c7e6d31a3a1a4bd67479f402c323fb0679271e)
-
-Upstream-Status: Backport [libical 13642054f650795446f6020d9d2e14d147b8da51]
-Signed-off-by: Ross Burton <[email protected]>
----
- src/libical-glib/CMakeLists.txt | 9 +++++----
- src/libical/CMakeLists.txt      | 2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index d63bbf3c..470a4d22 100644
---- a/src/libical-glib/CMakeLists.txt
-+++ b/src/libical-glib/CMakeLists.txt
-@@ -24,16 +24,17 @@ if(NOT DEFINED LIBXML2_DEFINITIONS)
- endif()
- target_compile_options(
-   ical-glib-src-generator
--  PUBLIC
-+  PRIVATE
-     ${GLIB_CFLAGS}
-     ${LIBXML2_DEFINITIONS}
-     -DG_LOG_DOMAIN=\"src-generator\"
- )
- target_link_libraries(
-   ical-glib-src-generator
--  ${GLIB_LDFLAGS}
--  ${GOBJECT_LDFLAGS}
--  ${LIBXML2_LIBRARIES}
-+  PRIVATE
-+    ${GLIB_LDFLAGS}
-+    ${GOBJECT_LDFLAGS}
-+    ${LIBXML2_LIBRARIES}
- )
- 
- install(
-diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt
-index 6fc2e953..583f2eeb 100644
---- a/src/libical/CMakeLists.txt
-+++ b/src/libical/CMakeLists.txt
-@@ -294,7 +294,7 @@ if(DEFINED CMAKE_THREAD_LIBS_INIT)
-   target_link_libraries(ical ${CMAKE_THREAD_LIBS_INIT})
- endif()
- if(ICU_FOUND)
--  target_link_libraries(ical ${ICU_LIBRARIES})
-+  target_link_libraries(ical PRIVATE ${ICU_LIBRARIES})
-   if(VCPKG_MANIFEST_MODE)
-     if(NOT APPLE AND NOT WIN32)
-       target_link_libraries(ical "m;stdc++")
--- 
-2.43.0
-
diff --git a/meta/recipes-support/libical/libical_4.0.5.bb 
b/meta/recipes-support/libical/libical_4.0.6.bb
similarity index 91%
rename from meta/recipes-support/libical/libical_4.0.5.bb
rename to meta/recipes-support/libical/libical_4.0.6.bb
index e9b093544f1..7b9185c3742 100644
--- a/meta/recipes-support/libical/libical_4.0.5.bb
+++ b/meta/recipes-support/libical/libical_4.0.6.bb
@@ -10,10 +10,8 @@ LIC_FILES_CHKSUM = 
"file://LICENSE.txt;md5=6d9294493d031c817783b0400a126c89 \
                     "
 SECTION = "libs"
 
-SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
-           file://0001-Mark-ICU-as-private-linkage-1366.patch \
-           "
-SRC_URI[sha256sum] = 
"cc09a3ac41d60e6144e644bd3fcf97d47106d659c4a0b8965102581401e67c9c"
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz"
+SRC_URI[sha256sum] = 
"2e3729cb69c282d3bb17a8d2b198af6e4bc7502fd3621c9adf573921fe9dceb0"
 
 inherit cmake pkgconfig gobject-introspection vala github-releases
 
-- 
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#247239): 
https://lists.openembedded.org/g/openembedded-core/message/247239
Mute This Topic: https://lists.openembedded.org/mt/121589196/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to