<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9c851eb98715e460f803a1f4e64c50fcf0750553">https://github.com/macports/macports-ports/commit/9c851eb98715e460f803a1f4e64c50fcf0750553</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9c851eb9871 evolution-data-server-gtk4: fix build with ICU 76
</span>9c851eb9871 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9c851eb98715e460f803a1f4e64c50fcf0750553
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun Dec 15 15:43:07 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> evolution-data-server-gtk4: fix build with ICU 76
</span>---
gnome/evolution-data-server-gtk4/Portfile | 8 +++--
.../files/patch-fix-icu.diff | 42 ++++++++++++++++++++++
2 files changed, 47 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server-gtk4/Portfile b/gnome/evolution-data-server-gtk4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce595ddc1db..d951fc1950d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server-gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server-gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,12 +60,14 @@ depends_lib-append port:db${bdb_ver} \
</span> depends_run-append path:bin/perl:perl5
patchfiles-append patch-cmake-find-our-build-tools.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-remove-linker-flag-no-undefined.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-linker-flag-no-undefined.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-icu.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ICU requires C++17
</span> compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2017
</span> configure.cxxflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++17
</span>
# weather and oauth2 cannot be enabled at the moment,
# since MacPorts does not have required versions of dependencies.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server-gtk4/files/patch-fix-icu.diff b/gnome/evolution-data-server-gtk4/files/patch-fix-icu.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..12baf5d732f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server-gtk4/files/patch-fix-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 52021a61ffa20d7a2d3b79ed5caa18805cb027cf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Milan Crha <mcrha@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 19 Nov 2024 11:15:12 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] I#574 - Fails to build/link against icu 76.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/574
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 64ce2e206..92ef05f76 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -376,13 +376,13 @@ endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU started shipping pkg-config files but it's not present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on many systems, if we don't find the pkg-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file then let's fallback on a manual check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pkg_check_modules(ICU icu-i18n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pkg_check_modules(ICU icu-i18n icu-uc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT ICU_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT HAVE_UNICODE_UCOL_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "ICU unicode/ucol.h not found; icu-i18n is required")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif(HAVE_UNICODE_UCOL_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(NOT HAVE_UNICODE_UCOL_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_REQUIRED_LIBRARIES "-licui18n -licuuc -licudata")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_C_SOURCE_COMPILES("#include <unicode/ucol.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,7 +393,7 @@ if(NOT ICU_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ICU_CFLAGS -D_REENTRANT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ICU_LIBS "-licui18n -licuuc -licudata")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(HAVE_UCOL_OPEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "Failed to find icu-i18n, install its development files or build them first")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "Failed to find icui18n, icuuc and icudata, install its development files or build them first")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(HAVE_UCOL_OPEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(NOT ICU_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>