diff mbox series

[meta-gnome] evolution-data-server: Fix build with ICU-76+

Message ID 20241123223445.1611457-1-raj.khem@gmail.com
State New
Headers show
Series [meta-gnome] evolution-data-server: Fix build with ICU-76+ | expand

Commit Message

Khem Raj Nov. 23, 2024, 10:34 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../evolution-data-server.bb                  |  1 +
 ...Fails-to-build-link-against-icu-76.1.patch | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-I-574-Fails-to-build-link-against-icu-76.1.patch
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 384484e0dc..f0b43256d7 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -18,6 +18,7 @@  SRC_URI += " \
     file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
     file://0004-call-native-helpers.patch \
     file://0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch \
+    file://0001-I-574-Fails-to-build-link-against-icu-76.1.patch \
     file://iconv-detect.h \
 "
 
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-I-574-Fails-to-build-link-against-icu-76.1.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-I-574-Fails-to-build-link-against-icu-76.1.patch
new file mode 100644
index 0000000000..9f1bbfe5e0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-I-574-Fails-to-build-link-against-icu-76.1.patch
@@ -0,0 +1,42 @@ 
+From 12666816df679118fe50f15ba2da3244c62ac215 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 19 Nov 2024 11:15:12 +0100
+Subject: [PATCH] I#574 - Fails to build/link against icu 76.1
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/574
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/evolution-data-server/-/pipelines/761044]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42721b3..fcaa188 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -376,13 +376,13 @@ endif(WIN32)
+ # ICU started shipping pkg-config files but it's not present
+ # on many systems, if we don't find the pkg-config
+ # file then let's fallback on a manual check
+-pkg_check_modules(ICU icu-i18n)
++pkg_check_modules(ICU icu-i18n icu-uc)
+ 
+ if(NOT ICU_FOUND)
+ 	CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H)
+ 	if(NOT HAVE_UNICODE_UCOL_H)
+ 		message(FATAL_ERROR "ICU unicode/ucol.h not found; icu-i18n is required")
+-	endif(HAVE_UNICODE_UCOL_H)
++	endif(NOT HAVE_UNICODE_UCOL_H)
+ 
+ 	set(CMAKE_REQUIRED_LIBRARIES "-licui18n -licuuc -licudata")
+ 	CHECK_C_SOURCE_COMPILES("#include <unicode/ucol.h>
+@@ -393,7 +393,7 @@ if(NOT ICU_FOUND)
+ 		set(ICU_CFLAGS -D_REENTRANT)
+ 		set(ICU_LIBS "-licui18n -licuuc -licudata")
+ 	else(HAVE_UCOL_OPEN)
+-		message(FATAL_ERROR "Failed to find icu-i18n, install its development files or build them first")
++		message(FATAL_ERROR "Failed to find icui18n, icuuc and icudata, install its development files or build them first")
+ 	endif(HAVE_UCOL_OPEN)
+ endif(NOT ICU_FOUND)
+