git: 36bc497cf6ca - main - databases/evolution-data-server: Fix build with ICU 76+

The branch main has been updated by diizzy:

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

commit 36bc497cf6ca03161bee5f64a02d32e732c47d60
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-25 21:57:42 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-25 22:00:06 +0000

    databases/evolution-data-server: Fix build with ICU 76+
    
    * Bump C++ version to c++17
    * Adjust CMake build script to include all required ICU libraries
    
    PR:             278420
    Approved by:    portmgr (blanket, build fix)
---
 databases/evolution-data-server/Makefile           | 10 +++++-----
 .../files/patch-CMakeLists.txt                     | 22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 0b4cbf4ebfd8..ba50c6c2b7b5 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -31,8 +31,8 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bdb:5 cmake compiler:c++11-lib cpe gettext gnome gperf \
-		iconv:wchar_t localbase pathfix pkgconfig python:build\
+USES=		bdb:5 cmake compiler:c++17-lang cpe gettext gnome gperf \
+		iconv:wchar_t localbase pathfix pkgconfig python:build \
 		sqlite tar:xz xorg
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
@@ -40,10 +40,10 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
 
+CMAKE_OFF=	CMAKE_CXX_EXTENSIONS
 CMAKE_ARGS=	-DENABLE_INTROSPECTION=ON \
-		-DENABLE_UOA=OFF
-
-CMAKE_ARGS+=	-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
+		-DENABLE_UOA=OFF \
+		-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
 		-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5"
 
 GLIB_SCHEMAS=	org.gnome.evolution-data-server.addressbook.gschema.xml \
diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt
index 498ca37305de..54edf6edce36 100644
--- a/databases/evolution-data-server/files/patch-CMakeLists.txt
+++ b/databases/evolution-data-server/files/patch-CMakeLists.txt
@@ -1,6 +1,24 @@
---- CMakeLists.txt.orig	2021-11-05 17:23:17 UTC
+--- CMakeLists.txt.orig	2022-08-05 07:45:35 UTC
 +++ CMakeLists.txt
-@@ -521,6 +521,7 @@ endif(WITH_LIBDB)
+@@ -6,7 +6,7 @@ project(evolution-data-server
+ project(evolution-data-server
+ 	VERSION 3.44.4
+ 	LANGUAGES C CXX)
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
+ 
+ # Base Version: This is for API/version tracking for things like
+@@ -358,7 +358,7 @@ 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)
+@@ -526,6 +526,7 @@ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
  # ******************************
  
  set(CMAKE_REQUIRED_LIBRARIES "-liconv")