From: Wang Mingyu <wan...@cn.fujitsu.com>
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 <wan...@cn.fujitsu.com>
---
.../evolution-data-server.bb | 18 ++++----
.../evolution-data-server.inc | 4 +-
...Fails-to-build-link-against-icu-76.1.patch | 42 -------------------
3 files changed, 10 insertions(+), 54 deletions(-)
delete 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 --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
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"
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 \
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"
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 @@
-From 12666816df679118fe50f15ba2da3244c62ac215 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mc...@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.k...@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)
-
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#114146):
https://lists.openembedded.org/g/openembedded-devel/message/114146
Mute This Topic: https://lists.openembedded.org/mt/109892008/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
