gentoo auto-resync : 06:03:2024 - 01:06:16

4 files changed, 78 insertions, 1 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index ba87db106595..4cbe32da8755 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 546dec898945..d58437a3b622 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,6 @@
+AUX 3.50.3-fix-overlinking.patch 2595 BLAKE2B 05c0004e13a304a8643af033094087f5888c8f0b8309f83863c13d1feb3d148ac2776734ab39adcd343c9f57cbd7384aca8df58ce9f6d14af94c250ba29c27da SHA512 5737ab4dbb08e708137caa2089a41eac9ff2d7386fa93a52a43878fb2cb82ccf7d10fb4642988143140e6a33471364431490dcfc0ec696fa6e5d676f8a87f133
 DIST evolution-ews-3.50.2.tar.xz 707800 BLAKE2B 18241eff067658af2f4620af87dea1c9c7c62476bbf9bf259addf15868a3b7e3f156dc952f21af2cad7ba6c2da9fd348b8733e5887f4276ad7eeeca8f9088476 SHA512 9aa4bb023922e39132a0ac3171d95f8362116960aa14dcb961b31ad242e6d7bcf2e946f19aea2c6f9a5324ca0954731264594a27fbb2b0e2cc38eca0cf441108
 DIST evolution-ews-3.50.3.tar.xz 708336 BLAKE2B e8fe4e2a6539142847d6610a61e2f57a83d604946270cd7b23d7e34fa89a38f644a05e452bbc03a6d96553936a38719afb7296eed03c7134735f937943d57114 SHA512 12c7fbe72f375837f185d4c8dbcb2167d327a0ad4b2ca822e4e5349d561e996e7a7405c6f8d36ceeddff0015286117db66a65d2756003aa8ca96948d7826e51f
 EBUILD evolution-ews-3.50.2.ebuild 1581 BLAKE2B 8ab2d02d0d858bcee178981fbf2c969f410d833250d07c0cdd6fccac98402bee1a4036737d4f72db3acace354b8d8253876d15738b500d7252eaae24c8babd6f SHA512 4a22b094baf8b0093e5792b81dccc787771e009a00b9c2c82c0e86bdc7bb9cfad4201dd9fc153160f3890eb09a09e96603c4b0e498ef8b33af53c9b5e8688e3f
-EBUILD evolution-ews-3.50.3.ebuild 1583 BLAKE2B fa2d2002b23a07908577ddb2b9d2c5661f8c20971cdc236b2382df4fd44ab77509837f6cefab92be1ccdab45f868d49381ce2699fc8809a7a68e82e484ca1eeb SHA512 5f038f91b8edc5c294304be749ffce8ccdc10814ce81d3a8580502cf1f89f1d6f2ecb9ffa95ce098855a362f2acc7044c9388884dba0b44f20f3d9d03d6664d7
+EBUILD evolution-ews-3.50.3-r1.ebuild 1758 BLAKE2B a6a7a1fe2dfd9aaa5308f8af7a62660c7c3be8e080db46ff2536a58ab10132f0cef29789779ceec409569151a639d3b23edab51d73f8d3fac9534bc4d4c40ca2 SHA512 ca4c28177980a3851edba26cd13f773d4b5d2991ad3559d27208bfc6832d3164780238962bead25d06726abd1d19290dca19faee905707df4ef7612442d5fdf8
 MISC metadata.xml 354 BLAKE2B a6cf76e87956f2418a25c83542af3e5efe415943426b03750b2572129b06f977f900207a1eef805b7ae463a84204d12bf286ef9ed0a5b6990cbac2c77783260f SHA512 9f06dce58e2dfdba0a22f8a711d5fc98aba9ae1d130173bd7ef8effd0bb3c1cf046eef712f7ea7bd55c4382ca01e78d7028419ce41812d33ef38a1329978af56
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.50.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild
index 24f764823f92..f1289dd7ac96 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.50.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild
@@ -45,6 +45,9 @@ RESTRICT="test !test? ( test )"
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	# Fix wrongly linking in GTK3 webkit without --as-needed, which breaks GTK4 evolution-data-server apps like gnome-contacts
+	eapply "${FILESDIR}"/${PV}-fix-overlinking.patch
 }
 
 src_configure() {
diff --git a/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch b/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch
new file mode 100644
index 000000000000..7628390f27f8
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch
@@ -0,0 +1,73 @@
+From c9e8707d024048ea595d825ed08833c9aa6bff37 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 4 Mar 2024 18:02:54 +0100
+Subject: [PATCH] build: Correct overlinking on the m365 part
+
+This can bring in gtk3 and other UI-specific libs into the background processes,
+when the compiler does not filter them out, which can happen with clang.
+
+Related to https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/222
+---
+ src/Microsoft365/calendar/CMakeLists.txt | 3 ---
+ src/Microsoft365/common/CMakeLists.txt   | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/src/Microsoft365/calendar/CMakeLists.txt b/src/Microsoft365/calendar/CMakeLists.txt
+index 676e2d7f..60801886 100644
+--- a/src/Microsoft365/calendar/CMakeLists.txt
++++ b/src/Microsoft365/calendar/CMakeLists.txt
+@@ -27,7 +27,6 @@ target_compile_definitions(ecalbackendmicrosoft365 PRIVATE
+ 
+ target_compile_options(ecalbackendmicrosoft365 PUBLIC
+ 	${CAMEL_CFLAGS}
+-	${EVOLUTION_CALENDAR_CFLAGS}
+ 	${LIBEBACKEND_CFLAGS}
+ 	${LIBECAL_CFLAGS}
+ 	${LIBEDATACAL_CFLAGS}
+@@ -41,7 +40,6 @@ target_include_directories(ecalbackendmicrosoft365 PUBLIC
+ 	${CMAKE_SOURCE_DIR}/src/Microsoft365
+ 	${CMAKE_CURRENT_BINARY_DIR}
+ 	${CAMEL_INCLUDE_DIRS}
+-	${EVOLUTION_CALENDAR_INCLUDE_DIRS}
+ 	${LIBEBACKEND_INCLUDE_DIRS}
+ 	${LIBECAL_INCLUDE_DIRS}
+ 	${LIBEDATACAL_INCLUDE_DIRS}
+@@ -51,7 +49,6 @@ target_include_directories(ecalbackendmicrosoft365 PUBLIC
+ target_link_libraries(ecalbackendmicrosoft365
+ 	${DEPENDENCIES}
+ 	${CAMEL_LDFLAGS}
+-	${EVOLUTION_CALENDAR_LDFLAGS}
+ 	${LIBEBACKEND_LDFLAGS}
+ 	${LIBECAL_LDFLAGS}
+ 	${LIBEDATACAL_LDFLAGS}
+diff --git a/src/Microsoft365/common/CMakeLists.txt b/src/Microsoft365/common/CMakeLists.txt
+index 1b81e6ea..def3d020 100644
+--- a/src/Microsoft365/common/CMakeLists.txt
++++ b/src/Microsoft365/common/CMakeLists.txt
+@@ -31,7 +31,6 @@ target_compile_definitions(evolution-microsoft365 PRIVATE
+ 
+ target_compile_options(evolution-microsoft365 PUBLIC
+ 	${CAMEL_CFLAGS}
+-	${EVOLUTION_CALENDAR_CFLAGS}
+ 	${JSON_GLIB_CFLAGS}
+ 	${LIBEBACKEND_CFLAGS}
+ 	${LIBECAL_CFLAGS}
+@@ -48,7 +47,6 @@ target_include_directories(evolution-microsoft365 PUBLIC
+ 	${CMAKE_CURRENT_BINARY_DIR}
+ 	${CMAKE_CURRENT_SOURCE_DIR}
+ 	${CAMEL_INCLUDE_DIRS}
+-	${EVOLUTION_CALENDAR_INCLUDE_DIRS}
+ 	${JSON_GLIB_INCLUDE_DIRS}
+ 	${LIBEBACKEND_INCLUDE_DIRS}
+ 	${LIBECAL_INCLUDE_DIRS}
+@@ -59,7 +57,6 @@ target_include_directories(evolution-microsoft365 PUBLIC
+ 
+ target_link_libraries(evolution-microsoft365
+ 	${CAMEL_LDFLAGS}
+-	${EVOLUTION_CALENDAR_LDFLAGS}
+ 	${JSON_GLIB_LDFLAGS}
+ 	${LIBEBACKEND_LDFLAGS}
+ 	${LIBECAL_LDFLAGS}
+-- 
+2.43.0
+