<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/974906515ea47f02a3da7ac59ae8c7b5a2babf4b">https://github.com/macports/macports-ports/commit/974906515ea47f02a3da7ac59ae8c7b5a2babf4b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 974906515ea47f02a3da7ac59ae8c7b5a2babf4b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Nov 8 11:09:07 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> libphonenumber-cpp: update to 8.13.49
</span>---
devel/libphonenumber-cpp/Portfile | 61 ++++++++--------------
.../files/patch-cpp-CMakeLists.txt.diff | 44 ----------------
2 files changed, 21 insertions(+), 84 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libphonenumber-cpp/Portfile b/devel/libphonenumber-cpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 782716b96e4..f7adde4f13f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libphonenumber-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libphonenumber-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,10 @@ PortGroup github 1.0
</span> PortGroup boost 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup googlei18n libphonenumber 8.12.44 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup googlei18n libphonenumber 8.13.49 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name libphonenumber-cpp
license Apache-2
description Google's C++ library for parsing, formatting, storing \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,59 +17,38 @@ description Google's C++ library for parsing, formatting, storing \
</span> long_description {*}${description}
maintainers {devans @dbevans} openmaintainer
categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set main_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gtest_version 1.11.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gtest_distfile release-${gtest_version}.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gtest_srcdir ${workpath}/googletest-release-${gtest_version}/googletest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gtest_master https://github.com/google/googletest/archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${main_distfile}:main \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gtest_distfile}:gtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${github.master_sites}:main \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gtest_master}:gtest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${main_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7be20fa914cf9396a41e3730a6cfa9045f398861 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7b4dd63ade3f965af4bd9c0372cb1a5d41e828dea4437e9085281ba5ed97a4ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11139779 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gtest_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4a1a53c93848c3e80cfd857b0eb2c2aa5029e38b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 886330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d60561108306cc273b258f737ab5e7f040f533fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5caaa08b65c2d8076b00ae4f8c30c563b825f422e1b80ca7603ed5d4c112980a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12932625
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir google-libphonenumber-9e9f635/cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir google-libphonenumber-39a5b86/cpp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cpp-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gtest_srcdir ${prefix}/src/googletest
</span>
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:git \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:abseil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/icu-uc.pc:icu \
</span> port:protobuf3-cpp
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DABSL_PROPAGATE_CXX_STD=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTING=OFF \
</span> -DGTEST_SOURCE_DIR=${gtest_srcdir} \
-DGTEST_INCLUDE_DIR=${gtest_srcdir}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DABSL_PROPAGATE_CXX_STD=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DREGENERATE_METADATA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_STD_MAP=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++17
</span>
# force protobuf3-cpp into the no_threadlocal mode on older systems
if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -DGOOGLE_PROTOBUF_NO_THREADLOCAL
</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;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_STD_MAP=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGOOGLE_PROTOBUF_NO_THREADLOCAL
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff b/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 72d7a87f698..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2021-12-23 03:14:18.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-01-08 14:27:34.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
</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;'>- # Helper functions dealing with finding libraries and programs this library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,10 +388,10 @@
</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;'>- if (NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions ("-Wall -Werror")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_definitions ("-Wall")
</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;'>--include_directories ("src")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories (BEFORE "src")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (${BUILD_STATIC_LIB} STREQUAL "ON")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build a static library (without -fPIC).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -498,8 +500,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list (APPEND GEOCODER_DEPS ${COMMON_DEPS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that the subset of base/ on which the geocoder relies is implemented
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on top of Boost header-only libraries (e.g. scoped_ptr.hpp).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries (geocoding ${LIBRARY_DEPS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries (geocoding-shared ${LIBRARY_DEPS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries (geocoding phonenumber ${LIBRARY_DEPS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries (geocoding-shared phonenumber-shared ${LIBRARY_DEPS})
</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;'>- # Build a specific library for testing purposes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,7 +564,7 @@
</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;'>- # Build the testing binary.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include_directories ("test")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories (BEFORE "test")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable (libphonenumber_test ${TEST_SOURCES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (TEST_LIBS phonenumber_testing ${GTEST_LIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>