diff mbox series

[meta-gnome,03/46] evolution-data-server: upgrade 3.54.0 -> 3.54.1

Message ID 1730874660-2364-3-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-gnome,01/46] babl: upgrade 0.1.108 -> 0.1.110 | expand

Commit Message

Mingyu Wang (Fujitsu) Nov. 6, 2024, 6:30 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
0001-cmake-Do-not-export-CC-into-gir-compiler.patch
0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
0004-call-native-helpers.patch

Bug Fixes:
==========
- Pass GError instead of CamelException to camel_movemail_solaris
- Fix argument types in ENABLE_BROKEN_SPOOL code
- Use GIConv instead of iconv_t with iconv wrappers
- ESoupSession: Sometimes accesses server without OAuth2 token

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../evolution-data-server/evolution-data-server.inc |  4 ++--
 ...01-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch |  9 +++------
 ...1-cmake-Do-not-export-CC-into-gir-compiler.patch | 13 +++++++++++--
 ...Lists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch | 11 ++++-------
 .../0004-call-native-helpers.patch                  | 11 ++++-------
 5 files changed, 24 insertions(+), 24 deletions(-)
diff mbox series

Patch

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 340c63998..516f94a66 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] = "a54b47b977a97030f738a412f4f5d5b2efbef5e0ebe8929b7cce00ac54681084"
-PV = "3.54.0"
+SRC_URI[archive.sha256sum] = "25b336c48a6babc36321d88094b382aeaf18abcbab4a9438b3fff90c29e105ae"
+PV = "3.54.1"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
index e8c6d6a76..9a00d0167 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
@@ -1,4 +1,4 @@ 
-From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
+From ab25af06d6eed4dfb785b4593e38112f8f376230 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 31 Mar 2019 18:11:55 +0200
 Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
@@ -17,10 +17,10 @@  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1672daf..0b3e4e0 100644
+index 5ccbf9c..5dfe9ee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
+@@ -569,17 +569,6 @@ if(NOT HAVE_ICONV)
  	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
  endif(NOT HAVE_ICONV)
  
@@ -38,6 +38,3 @@  index 1672daf..0b3e4e0 100644
  # ******************************
  # Backtraces for debugging
  # ******************************
--- 
-2.20.1
-
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
index 118d93a72..b89d5f25c 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
@@ -1,7 +1,16 @@ 
-Use G_IR_SCANNER without passing additional environment
+From 0f9763c77dcf44b1061517539287c79a59a6aede Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 6 Mar 2022 18:16:31 +0100
+Subject: [PATCH] Use G_IR_SCANNER without passing additional environment
 
 Upstream-Status: Inappropriate [OE-specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ cmake/modules/GObjectIntrospection.cmake | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
+index 9d2e6e7..3d8bb8c 100644
 --- a/cmake/modules/GObjectIntrospection.cmake
 +++ b/cmake/modules/GObjectIntrospection.cmake
 @@ -122,9 +122,7 @@ macro(gir_add_introspection gir)
@@ -15,7 +24,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  				${INTROSPECTION_SCANNER_ARGS}
  				--namespace=${_gir_namespace}
  				--nsversion=${_gir_version}
-@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_l
+@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
  		${_gir_identifies_prefixes}
  		${_gir_deps}
  		--add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
index 51eaf7cfe..b26d8f3b2 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
@@ -1,7 +1,7 @@ 
-From 20bd8946a5c73290d961df151e82033171639c0d Mon Sep 17 00:00:00 2001
+From 57dcb88745bea5e14a8d8d2d0e3d0d3876ee8c8a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Tue, 19 Dec 2017 16:55:13 +0100
-Subject: [PATCH 2/7] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
+Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,10 +16,10 @@  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 23 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed99904..9a2e99f 100644
+index 5dfe9ee..42721b3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -579,29 +579,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
+@@ -619,29 +619,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
  CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
  			int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2)
  
@@ -49,6 +49,3 @@  index ed99904..9a2e99f 100644
  # ******************************
  # system mail stuff
  # ******************************
--- 
-2.21.0
-
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
index 82f697250..c1d38bd0a 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
@@ -1,4 +1,4 @@ 
-From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001
+From 621c3fe47376fe3bb28625114613eb4f636cdba7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 31 Mar 2019 19:11:31 +0200
 Subject: [PATCH] call native helpers
@@ -15,7 +15,7 @@  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
-index e9e3259..e749d1b 100644
+index 480e3f6..fc40b20 100644
 --- a/src/addressbook/libebook-contacts/CMakeLists.txt
 +++ b/src/addressbook/libebook-contacts/CMakeLists.txt
 @@ -25,7 +25,7 @@ target_link_libraries(gen-western-table
@@ -28,10 +28,10 @@  index e9e3259..e749d1b 100644
  )
  
 diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
-index be626a8..14ac8b8 100644
+index 59bc77a..c5da19c 100644
 --- a/src/camel/CMakeLists.txt
 +++ b/src/camel/CMakeLists.txt
-@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC
+@@ -20,7 +20,7 @@ target_include_directories(camel-gen-tables PUBLIC
  
  add_custom_command(
  	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
@@ -40,6 +40,3 @@  index be626a8..14ac8b8 100644
  	DEPENDS camel-gen-tables
  )
  
--- 
-2.20.1
-