diff options
| author | Daniel Engberg <diizzy@FreeBSD.org> | 2025-01-25 22:57:42 +0100 |
|---|---|---|
| committer | Daniel Engberg <diizzy@FreeBSD.org> | 2025-01-25 23:00:06 +0100 |
| commit | 36bc497cf6ca03161bee5f64a02d32e732c47d60 (patch) | |
| tree | 7d56756ba8943e0e5eec1691ed7f0e56f309d51c /databases/evolution-data-server/files | |
| parent | x11-themes/kf5-qqc2-desktop-style: update to 5.116.1 (diff) | |
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)
Diffstat (limited to 'databases/evolution-data-server/files')
| -rw-r--r-- | databases/evolution-data-server/files/patch-CMakeLists.txt | 22 |
1 files changed, 20 insertions, 2 deletions
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") |