git: b5df074442a5 - main - gnome: update evolution stack to 3.54.3*

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Wed, 05 Mar 2025 13:33:32 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b5df074442a558851f502122e38f9445568009a5

commit b5df074442a558851f502122e38f9445568009a5
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2025-03-05 13:31:59 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-03-05 13:33:30 +0000

    gnome: update evolution stack to 3.54.3*
    
    evolution have switched to libsoup3
---
 databases/evolution-data-server/Makefile           |  4 ++-
 databases/evolution-data-server/distinfo           |  6 ++--
 .../files/patch-CMakeLists.txt                     | 34 +++++++++++-----------
 .../files/patch-src_libedataserver_e-ms-oapxbc.c   | 11 +++++++
 databases/evolution-data-server/pkg-plist          |  2 ++
 mail/evolution-ews/Makefile                        |  4 +--
 mail/evolution-ews/distinfo                        |  6 ++--
 mail/evolution-ews/pkg-plist                       |  3 ++
 mail/evolution/Makefile                            |  4 +--
 mail/evolution/distinfo                            |  6 ++--
 mail/evolution/pkg-plist                           |  3 ++
 11 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index a7a6319dd201..19988e186039 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	evolution-data-server
-DISTVERSION=	3.52.3
+DISTVERSION=	3.54.3
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -40,6 +40,8 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
 
+LDFLAGS=	-L${LOCALBASE}/lib
+
 CMAKE_OFF=	CMAKE_CXX_EXTENSIONS
 CMAKE_ARGS=	-DENABLE_INTROSPECTION=ON \
 		-DENABLE_UOA=OFF \
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 1bb023da538c..19b66ca0a6a8 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739808035
-SHA256 (gnome/evolution-data-server-3.52.3.tar.xz) = e9f6c80c142033b1801bccaa6221c453de34ead4ea089b2086b19086f9a9c2e4
-SIZE (gnome/evolution-data-server-3.52.3.tar.xz) = 5055360
+TIMESTAMP = 1741179148
+SHA256 (gnome/evolution-data-server-3.54.3.tar.xz) = 5108dc38ee5cc1f8ef9155e87f6c4129f9644550a0962c5ae23ff807b57cb8d0
+SIZE (gnome/evolution-data-server-3.54.3.tar.xz) = 5099688
diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt
index 79fcbf3fa017..729aaab929a4 100644
--- a/databases/evolution-data-server/files/patch-CMakeLists.txt
+++ b/databases/evolution-data-server/files/patch-CMakeLists.txt
@@ -1,19 +1,19 @@
---- CMakeLists.txt.orig	2024-06-28 10:29:41.000000000 +0300
-+++ CMakeLists.txt	2025-02-17 19:34:42.145248000 +0300
-@@ -374,7 +374,7 @@
- # 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)
+--- CMakeLists.txt.orig	2025-03-05 12:53:07 UTC
++++ CMakeLists.txt
+@@ -120,7 +120,6 @@ set(sqlite_minimum_version 3.7.17)
+ set(libsecret_minimum_version 0.5)
+ set(libxml_minimum_version 2.0.0)
+ set(sqlite_minimum_version 3.7.17)
+-set(uuid_minimum_version 2.0)
  
- if(NOT ICU_FOUND)
- 	CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H)
-@@ -549,6 +549,7 @@
- # ******************************
+ # Optional Packages
+ set(goa_minimum_version 3.8)
+@@ -421,7 +420,7 @@ pkg_check_modules(JSON_GLIB REQUIRED json-glib-1.0>=${
+ # **************************************************************
  
- set(CMAKE_REQUIRED_LIBRARIES "-liconv")
-+set(CMAKE_REQUIRED_FLAGS "-L/usr/local/lib")
- CHECK_C_SOURCE_COMPILES("#include <iconv.h>
- 			#include <stdlib.h>
- 			int main(void) { iconv_t cd; cd = iconv_open (\"UTF-8\", \"ISO-8859-1\"); return 0; }" HAVE_LIBICONV)
+ pkg_check_modules(JSON_GLIB REQUIRED json-glib-1.0>=${json_glib_minimum_version})
+-pkg_check_modules(UUID REQUIRED uuid>=${uuid_minimum_version})
++pkg_check_modules(UUID uuid REQUIRED)
+ 
+ if(ENABLE_GTK)
+ 	add_printable_option(ENABLE_OAUTH2_WEBKITGTK "Enable WebKitGTK gtk3 for built-in OAuth2 authentications" ON)
diff --git a/databases/evolution-data-server/files/patch-src_libedataserver_e-ms-oapxbc.c b/databases/evolution-data-server/files/patch-src_libedataserver_e-ms-oapxbc.c
new file mode 100644
index 000000000000..55acff3ad554
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-src_libedataserver_e-ms-oapxbc.c
@@ -0,0 +1,11 @@
+--- src/libedataserver/e-ms-oapxbc.c.orig	2025-01-03 18:00:44 UTC
++++ src/libedataserver/e-ms-oapxbc.c
+@@ -42,6 +42,8 @@
+ #define DBUS_BROKER_PATH "/com/microsoft/identity/broker1"
+ #define AUTH_TYPE_OAUTH2 8
+ 
++#define UUID_STR_LEN		36
++
+ struct _EMsOapxbc {
+ 	GObject parent_instance;
+ 
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index b138e9e44b44..5b94b93b6855 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -263,6 +263,7 @@ include/evolution-data-server/libedataserver/e-list-iterator.h
 include/evolution-data-server/libedataserver/e-list.h
 include/evolution-data-server/libedataserver/e-memory.h
 include/evolution-data-server/libedataserver/e-module.h
+include/evolution-data-server/libedataserver/e-ms-oapxbc.h
 include/evolution-data-server/libedataserver/e-named-parameters.h
 include/evolution-data-server/libedataserver/e-network-monitor.h
 include/evolution-data-server/libedataserver/e-oauth2-service-base.h
@@ -534,6 +535,7 @@ share/locale/hi/LC_MESSAGES/evolution-data-server.mo
 share/locale/hr/LC_MESSAGES/evolution-data-server.mo
 share/locale/hu/LC_MESSAGES/evolution-data-server.mo
 share/locale/id/LC_MESSAGES/evolution-data-server.mo
+share/locale/ie/LC_MESSAGES/evolution-data-server.mo
 share/locale/is/LC_MESSAGES/evolution-data-server.mo
 share/locale/it/LC_MESSAGES/evolution-data-server.mo
 share/locale/ja/LC_MESSAGES/evolution-data-server.mo
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index ac42e2d02d72..613de1810209 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	evolution-ews
-DISTVERSION=	3.52.3
+DISTVERSION=	3.54.3.0
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -12,7 +12,7 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
-LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+LIB_DEPENDS=	libsoup-3.0.so:devel/libsoup \
 		libfribidi.so:converters/fribidi \
 		libicuuc.so:devel/icu \
 		libmspack.so:archivers/libmspack \
diff --git a/mail/evolution-ews/distinfo b/mail/evolution-ews/distinfo
index 4e455cdd2238..dab854993c66 100644
--- a/mail/evolution-ews/distinfo
+++ b/mail/evolution-ews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739828295
-SHA256 (gnome/evolution-ews-3.52.3.tar.xz) = 1fd6382fd5fd30043845cfc5dc4c34fe012bcc83512b6030154250bc618068c0
-SIZE (gnome/evolution-ews-3.52.3.tar.xz) = 723164
+TIMESTAMP = 1741181273
+SHA256 (gnome/evolution-ews-3.54.3.0.tar.xz) = 1ac707cf2591a844512575621a4930c761b2174dbc5ecb1c8a185262946a14f6
+SIZE (gnome/evolution-ews-3.54.3.0.tar.xz) = 737492
diff --git a/mail/evolution-ews/pkg-plist b/mail/evolution-ews/pkg-plist
index f25dd630b2a5..12216ac728e8 100644
--- a/mail/evolution-ews/pkg-plist
+++ b/mail/evolution-ews/pkg-plist
@@ -10,6 +10,7 @@ lib/evolution-data-server/registry-modules/module-ews-backend.so
 lib/evolution-data-server/registry-modules/module-microsoft365-backend.so
 lib/evolution-ews/libcamelews-priv.so
 lib/evolution-ews/libevolution-ews.so
+lib/evolution-ews/libevolution-ews-common.so
 lib/evolution-ews/libevolution-microsoft365.so
 lib/evolution/modules/module-ews-configuration.so
 lib/evolution/modules/module-microsoft365-configuration.so
@@ -17,6 +18,7 @@ share/evolution-data-server/ews/windowsZones.xml
 share/evolution/errors/module-ews-configuration.error
 share/locale/as/LC_MESSAGES/evolution-ews.mo
 share/locale/bn_IN/LC_MESSAGES/evolution-ews.mo
+share/locale/ka/LC_MESSAGES/evolution-ews.mo
 share/locale/bs/LC_MESSAGES/evolution-ews.mo
 share/locale/ca/LC_MESSAGES/evolution-ews.mo
 share/locale/cs/LC_MESSAGES/evolution-ews.mo
@@ -36,6 +38,7 @@ share/locale/hu/LC_MESSAGES/evolution-ews.mo
 share/locale/id/LC_MESSAGES/evolution-ews.mo
 share/locale/it/LC_MESSAGES/evolution-ews.mo
 share/locale/ja/LC_MESSAGES/evolution-ews.mo
+share/locale/ka/LC_MESSAGES/evolution-ews.mo
 share/locale/kn/LC_MESSAGES/evolution-ews.mo
 share/locale/lt/LC_MESSAGES/evolution-ews.mo
 share/locale/lv/LC_MESSAGES/evolution-ews.mo
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index fcec949c8e5c..9cae3e0ddc0c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	evolution
-DISTVERSION=	3.52.3
+DISTVERSION=	3.54.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -34,7 +34,7 @@ LIB_DEPENDS=	libcryptui.so:security/libcryptui \
 		libnss3.so:security/nss \
 		libp11-kit.so:security/p11-kit \
 		libsecret-1.so:security/libsecret \
-		libsoup-2.4.so:devel/libsoup \
+		libsoup-3.0.so:devel/libsoup3 \
 		libwebkit2gtk-4.1.so:www/webkit2-gtk@41
 RUN_DEPENDS=	highlight:textproc/highlight \
 		iso-codes>=0:misc/iso-codes
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 06f7efe26f3f..23ddcd8c913a 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739796472
-SHA256 (gnome/evolution-3.52.3.tar.xz) = 1c22f53b5554e260a48e917f3d669834d24e4d3ad5a124cbe042a2a4ace441c5
-SIZE (gnome/evolution-3.52.3.tar.xz) = 13619052
+TIMESTAMP = 1741180861
+SHA256 (gnome/evolution-3.54.3.tar.xz) = 746cf81ef5c325af17f53b2fab46d67260f3b13da014d8994d4ad9e846b855eb
+SIZE (gnome/evolution-3.54.3.tar.xz) = 13708860
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 7a647bcdaef8..8f54cb2f6fa5 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -486,6 +486,7 @@ include/evolution/mail/e-mail-templates-store.h
 include/evolution/mail/e-mail-templates.h
 include/evolution/mail/e-mail-ui-session.h
 include/evolution/mail/e-mail-view.h
+include/evolution/mail/e-mail-viewer.h
 include/evolution/mail/e-mail.h
 include/evolution/mail/em-composer-utils.h
 include/evolution/mail/em-config.h
@@ -1506,6 +1507,7 @@ share/applications/org.gnome.Evolution.desktop
 %%DATADIR%%/ui/evolution-composer.ui
 %%DATADIR%%/ui/evolution-contacts.ui
 %%DATADIR%%/ui/evolution-mail-reader.ui
+%%DATADIR%%/ui/evolution-mail-viewer.ui
 %%DATADIR%%/ui/evolution-mail.ui
 %%DATADIR%%/ui/evolution-memos.ui
 %%DATADIR%%/ui/evolution-shell.ui
@@ -6674,6 +6676,7 @@ share/locale/is/LC_MESSAGES/evolution.mo
 share/locale/it/LC_MESSAGES/evolution.mo
 share/locale/ja/LC_MESSAGES/evolution.mo
 share/locale/ka/LC_MESSAGES/evolution.mo
+share/locale/kab/LC_MESSAGES/evolution.mo
 share/locale/kk/LC_MESSAGES/evolution.mo
 share/locale/kn/LC_MESSAGES/evolution.mo
 share/locale/ko/LC_MESSAGES/evolution.mo