CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

evolution-data-server: upgrade 3.54.1 -> 3.54.2

Browse Source 
0001-I-574-Fails-to-build-link-against-icu-76.1.patch
removed since it's included in 3.54.2

Changelog:
==========
- libedataserverui: Avoid initializing the icon_theme when building introspection data
- Fails to build/link against icu 76.1
- Correct certificate key usage constants

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2024-12-03 08:16:10 +08:00 committed by Khem Raj
parent 24d413cc37
commit 89b34aa03d
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
View File

@ -11,16 +11,14 @@ inherit pkgconfig gsettings gobject-introspection mime-xdg features_check gtk-do
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
REQUIRED_DISTRO_FEATURES = "opengl"
SRC_URI += " \
file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \
file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
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 \
"
SRC_URI += "file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \
file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
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://iconv-detect.h \
"
LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF"

4
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
View File

@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
GNOMEBASEBUILDCLASS = "cmake"
inherit gnomebase upstream-version-is-even
SRC_URI[archive.sha256sum] = "25b336c48a6babc36321d88094b382aeaf18abcbab4a9438b3fff90c29e105ae"
PV = "3.54.1"
SRC_URI[archive.sha256sum] = "11f0253089c8abf456cffda3fe658a35a0de2b8ae93d8f257d6b020ae7963d20"
PV = "3.54.2"

42
meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-I-574-Fails-to-build-link-against-icu-76.1.patch
View File

@ -1,42 +0,0 @@
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)