<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/6260bfb39ed4d704988f281650c4be9d76ed9800">https://github.com/macports/macports-ports/commit/6260bfb39ed4d704988f281650c4be9d76ed9800</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 6260bfb39ed evolution-data-server: fix build with ICU 76
</span>6260bfb39ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6260bfb39ed4d704988f281650c4be9d76ed9800
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun Dec 15 15:37:00 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> evolution-data-server: fix build with ICU 76
</span>---
gnome/evolution-data-server/Portfile | 11 +++---
...bebook-contacts-e-phone-number-private.cpp.diff | 18 ---------
.../files/patch-fix-cxx-version.diff | 45 ++++++++++++++++++++++
.../evolution-data-server/files/patch-fix-icu.diff | 42 ++++++++++++++++++++
4 files changed, 93 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/Portfile b/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8652557192..0c7d5d924c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span>
name evolution-data-server
version 3.36.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span>
categories gnome
license LGPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,13 +56,14 @@ depends_run-append \
</span>
patchfiles-append patch-cmake-find-our-build-tools.diff
patchfiles-append patch-remove-linker-flag-no-undefined.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-cxx-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-icu.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libphonenumber-cpp uses C++11 extensions but evolution-data-server doesn't assert -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this causes configuration failures when testing for libphonenumber on at least Mojave/Xcode 10
</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>
configure.args-append \
-DENABLE_EXAMPLES=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff b/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1934386048b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-11-19 05:53:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/addressbook/libebook-contacts/e-phone-number-private.cpp 2014-11-28 13:09:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,9 +118,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Extract two-letter country code from current locale id if needed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * From outside this is a C library, so we better consult the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * C infrastructure instead of std::locale, which might divert. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (region_code == NULL || region_code[0] == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (region_code == NULL || region_code[0] == '\0') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef LC_ADDRESS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _e_phone_number_cxx_region_code_from_locale (setlocale (LC_ADDRESS, NULL));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _e_phone_number_cxx_region_code_from_locale (setlocale (LC_ALL, NULL));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return region_code;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-fix-cxx-version.diff b/gnome/evolution-data-server/files/patch-fix-cxx-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5420cb49cde
</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/files/patch-fix-cxx-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e9984d241dc6e0da541dc381f573ca1b3aea347c 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: Mon, 20 Feb 2023 11:36:23 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] I#453 - build: Make it possible to override C++ standard ][
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use target_compile_features() instead of global C++ standard variable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which allows to define minimum version for the target, instead of forcing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+certain version for the whole project.
</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/453
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/addressbook/libebook-contacts/CMakeLists.txt | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 4 insertions(+), 1 deletion(-)
</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 099f2061c1..fbe9803811 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;'>+@@ -6,7 +6,6 @@ cmake_policy(VERSION 3.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(evolution-data-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION 3.47.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LANGUAGES C CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_CXX_STANDARD 14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Base Version: This is for API/version tracking for things like
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index febbc8dec9..ae992d32ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/addressbook/libebook-contacts/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/addressbook/libebook-contacts/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,6 +79,10 @@ if(ENABLE_PHONENUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${PHONENUMBER_DEFINITIONS}
</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;'>++ target_compile_features(ephonenumber-private PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cxx_std_14
</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;'>+ target_compile_options(ephonenumber-private PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ADDRESSBOOK_CFLAGS}
</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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-fix-icu.diff b/gnome/evolution-data-server/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/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>