3 files changed, 17 insertions, 3 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 59856f3ab7..f6b719392d 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,6 +11,7 @@ inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc g
 REQUIRED_DISTRO_FEATURES = "x11"
 
 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 \
@@ -25,7 +26,7 @@ GI_DATA_ENABLED="False"
 EXTRA_OECMAKE = " \
     -DSYSCONF_INSTALL_DIR=${sysconfdir} \
     -DWITH_KRB5=OFF \
-    -DENABLE_UOA=OFF \
+    -DENABLE_GOA=OFF \
     -DENABLE_GOOGLE_AUTH=OFF \
     -DENABLE_WEATHER=OFF \
     -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \
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 d22310f7ec..bcbe20d752 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
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
 
 inherit gnomebase upstream-version-is-even
 
-SRC_URI[archive.sha256sum] = "6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d"
-PV = "3.42.3"
+SRC_URI[archive.sha256sum] = "8c437af75edbef196034f7913f505c3f68acc18515a6eed20f3ef52452785898"
+PV = "3.43.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
new file mode 100644
index 0000000000..8fd077cedc
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/GObjectIntrospection.cmake  2022-03-06 18:10:47.724184883 +0100
++++ b/cmake/modules/GObjectIntrospection.cmake  2022-03-06 18:10:12.560450948 +0100
+@@ -122,9 +122,7 @@
+                file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
+ 
+                add_custom_command(
+-                       COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
+-                               ${INTROSPECTION_SCANNER_ENV}
+-                               ${G_IR_SCANNER}
++                       COMMAND ${G_IR_SCANNER}
+                                ${INTROSPECTION_SCANNER_ARGS}
+                                --namespace=${_gir_namespace}
+                                --nsversion=${_gir_version}