<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cc24d089326f0252c16b5ef57cc91b4b0f57768f">https://github.com/macports/macports-ports/commit/cc24d089326f0252c16b5ef57cc91b4b0f57768f</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 cc24d089326 evolution-data-server: update to version 3.36.5, dependencies
</span>cc24d089326 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cc24d089326f0252c16b5ef57cc91b4b0f57768f
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Oct 20 19:19:19 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> evolution-data-server: update to version 3.36.5, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * requires C++11, use compiler.cxx_standard
</span><span style='display:block; white-space:pre;color:#404040;'> * ensure that cmake uses python38
</span><span style='display:block; white-space:pre;color:#404040;'> * update cmake build flags
</span><span style='display:block; white-space:pre;color:#404040;'> * gobject-introspection and vala bindings remain disabled (for now)
</span>---
gnome/evolution-data-server/Portfile | 24 +++++++++-------------
.../files/patch-cmake-find-our-build-tools.diff | 21 +++----------------
.../files/patch-cmake-no-undefined.diff | 14 -------------
3 files changed, 13 insertions(+), 46 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 b909ec46fbf..d43d32e3432 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;'>@@ -2,11 +2,10 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span>
name evolution-data-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.28.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.36.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
description Addressbook and calender libs for GNOME.
long_description Evolution Data Server provides a central location for \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +19,9 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ef4e7f780e9bcbd1864a1daf8181443108b7a67d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d95348d27207cde4ff3209d16c9336fd2a97d958f4c563450ccdf2f7c07e8788 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4455136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 37f0434b0d89dbbae40343718b347d3788753373 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c555528c546d457be0dc0eaca5d766d4dfef7c408276cb05f9724c463bfe7fd9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4636800
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,14 +30,14 @@ depends_build-append \
</span>
# use our choice of python when building
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python38
</span>
depends_lib port:gtk3 \
port:gcr \
port:gnome-online-accounts \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gobject-introspection \
</span> port:icu \
port:kerberos5 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcanberra \
</span> port:libgdata \
port:libgweather \
port:libical \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,24 +49,21 @@ depends_lib port:gtk3 \
</span> port:nspr \
port:openldap \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vala \
</span> port:db53
# our choice of perl for installed scripts
depends_lib-append port:perl5.28
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-no-undefined.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-find-our-build-tools.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cmake-find-our-build-tools.diff
</span>
# libphonenumber-cpp uses C++11 extensions but evolution-data-server doesn't assert -std=c++11
# this causes configuration failures when testing for libphonenumber on at least Mojave/Xcode 10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span> configure.cxxflags-append -std=c++11
configure.args-append \
-DENABLE_SCHEMAS_COMPILE=OFF \
-DENABLE_GTK_DOC=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_UOA=OFF \
</span> -DWITH_OPENLDAP=${prefix} \
-DENABLE_INSTALLED_TESTS=OFF \
-DENABLE_INTROSPECTION=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +89,7 @@ use_parallel_build no
</span> variant phonenumber description {Phone number parsing/validation using libphonenumber} {
depends_lib-append port:libphonenumber-cpp
configure.cxxflags-append -DI18N_PHONENUMBERS_USE_BOOST
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DWITH_PHONENUMBER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DWITH_PHONENUMBER=${prefix}/lib
</span> }
default_variants +phonenumber
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-cmake-find-our-build-tools.diff b/gnome/evolution-data-server/files/patch-cmake-find-our-build-tools.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ab06cb989bb..1fd703b2c07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/files/patch-cmake-find-our-build-tools.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evolution-data-server/files/patch-cmake-find-our-build-tools.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-06-18 01:48:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-06-25 16:33:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,12 +292,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "You need gperf to build ${PROJECT_NAME}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT GPERF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_program(PERL perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_program(PERL perl5.28 perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT PERL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "You need perl to build ${PROJECT_NAME}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT PERL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_program(PYTHON NAMES python3 python2 python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_program(PYTHON NAMES python3.6 python3 python2 python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT PYTHON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "You need python to build ${PROJECT_NAME}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT PYTHON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,7 +306,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-10-07 00:13:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-10-20 16:14:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,7 +312,7 @@
</span> # db_load checking, it's optional
# ******************************
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evolution-data-server/files/patch-cmake-no-undefined.diff b/gnome/evolution-data-server/files/patch-cmake-no-undefined.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d7e067171b2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evolution-data-server/files/patch-cmake-no-undefined.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/SetupBuildFlags.cmake.orig 2017-09-10 19:39:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/SetupBuildFlags.cmake 2017-09-10 19:40:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,8 +78,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(CMAKE_CXX_COMPILER_ID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "BSD"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-undefined,error")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-undefined,error")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,error")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "BSD"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endmacro()
</span></pre><pre style='margin:0'>
</pre>