diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2024-12-03 08:16:10 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-12-03 09:44:32 -0800 |
commit | 89b34aa03d7cfddc1e324441d1d6e0da08fb594a (patch) | |
tree | 5023940c6a419184a4ab6d9a48756146fd60fd7d | |
parent | 24d413cc371de550c7742c824b9adc3ac927cc37 (diff) | |
download | meta-openembedded-89b34aa03d7cfddc1e324441d1d6e0da08fb594a.tar.gz |
evolution-data-server: upgrade 3.54.1 -> 3.54.2
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>
3 files changed, 10 insertions, 54 deletions
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 f0b43256d7..713d5ae289 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 | |||
@@ -11,16 +11,14 @@ inherit pkgconfig gsettings gobject-introspection mime-xdg features_check gtk-do | |||
11 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 11 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
12 | REQUIRED_DISTRO_FEATURES = "opengl" | 12 | REQUIRED_DISTRO_FEATURES = "opengl" |
13 | 13 | ||
14 | SRC_URI += " \ | 14 | SRC_URI += "file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ |
15 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ | 15 | file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ |
16 | file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ | 16 | file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ |
17 | file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ | 17 | file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ |
18 | file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ | 18 | file://0004-call-native-helpers.patch \ |
19 | file://0004-call-native-helpers.patch \ | 19 | file://0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch \ |
20 | file://0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch \ | 20 | file://iconv-detect.h \ |
21 | file://0001-I-574-Fails-to-build-link-against-icu-76.1.patch \ | 21 | " |
22 | file://iconv-detect.h \ | ||
23 | " | ||
24 | 22 | ||
25 | LKSTRFTIME = "HAVE_LKSTRFTIME=ON" | 23 | LKSTRFTIME = "HAVE_LKSTRFTIME=ON" |
26 | LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" | 24 | LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" |
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 516f94a665..f9dc173a9e 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc | |||
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ | |||
10 | GNOMEBASEBUILDCLASS = "cmake" | 10 | GNOMEBASEBUILDCLASS = "cmake" |
11 | inherit gnomebase upstream-version-is-even | 11 | inherit gnomebase upstream-version-is-even |
12 | 12 | ||
13 | SRC_URI[archive.sha256sum] = "25b336c48a6babc36321d88094b382aeaf18abcbab4a9438b3fff90c29e105ae" | 13 | SRC_URI[archive.sha256sum] = "11f0253089c8abf456cffda3fe658a35a0de2b8ae93d8f257d6b020ae7963d20" |
14 | PV = "3.54.1" | 14 | PV = "3.54.2" |
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 deleted file mode 100644 index 9f1bbfe5e0..0000000000 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-I-574-Fails-to-build-link-against-icu-76.1.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 12666816df679118fe50f15ba2da3244c62ac215 Mon Sep 17 00:00:00 2001 | ||
2 | From: Milan Crha <mcrha@redhat.com> | ||
3 | Date: Tue, 19 Nov 2024 11:15:12 +0100 | ||
4 | Subject: [PATCH] I#574 - Fails to build/link against icu 76.1 | ||
5 | |||
6 | Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/574 | ||
7 | |||
8 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/evolution-data-server/-/pipelines/761044] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 6 +++--- | ||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 42721b3..fcaa188 100644 | ||
16 | --- a/CMakeLists.txt | ||
17 | +++ b/CMakeLists.txt | ||
18 | @@ -376,13 +376,13 @@ endif(WIN32) | ||
19 | # ICU started shipping pkg-config files but it's not present | ||
20 | # on many systems, if we don't find the pkg-config | ||
21 | # file then let's fallback on a manual check | ||
22 | -pkg_check_modules(ICU icu-i18n) | ||
23 | +pkg_check_modules(ICU icu-i18n icu-uc) | ||
24 | |||
25 | if(NOT ICU_FOUND) | ||
26 | CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H) | ||
27 | if(NOT HAVE_UNICODE_UCOL_H) | ||
28 | message(FATAL_ERROR "ICU unicode/ucol.h not found; icu-i18n is required") | ||
29 | - endif(HAVE_UNICODE_UCOL_H) | ||
30 | + endif(NOT HAVE_UNICODE_UCOL_H) | ||
31 | |||
32 | set(CMAKE_REQUIRED_LIBRARIES "-licui18n -licuuc -licudata") | ||
33 | CHECK_C_SOURCE_COMPILES("#include <unicode/ucol.h> | ||
34 | @@ -393,7 +393,7 @@ if(NOT ICU_FOUND) | ||
35 | set(ICU_CFLAGS -D_REENTRANT) | ||
36 | set(ICU_LIBS "-licui18n -licuuc -licudata") | ||
37 | else(HAVE_UCOL_OPEN) | ||
38 | - message(FATAL_ERROR "Failed to find icu-i18n, install its development files or build them first") | ||
39 | + message(FATAL_ERROR "Failed to find icui18n, icuuc and icudata, install its development files or build them first") | ||
40 | endif(HAVE_UCOL_OPEN) | ||
41 | endif(NOT ICU_FOUND) | ||
42 | |||