Update to libphonenumber-8.13.3.

This commit is contained in:
ajacoutot 2022-12-28 14:36:09 +00:00
parent efa71cccd9
commit 50f0cf6c63
4 changed files with 29 additions and 35 deletions

View File

@ -2,7 +2,7 @@ COMMENT = C++ library to parse/format/validate phone numbers
GH_ACCOUNT = google
GH_PROJECT = libphonenumber
GH_TAGNAME = v8.12.48
GH_TAGNAME = v8.13.3
SHARED_LIBS += geocoding 0.0 # 8.12
SHARED_LIBS += phonenumber 0.0 # 8.12

View File

@ -1,2 +1,2 @@
SHA256 (libphonenumber-8.12.48.tar.gz) = S9K3yJ8cuo3HgDg5X0zDI23VqmIRj+tMNUqIkGNPrqk=
SIZE (libphonenumber-8.12.48.tar.gz) = 12246398
SHA256 (libphonenumber-8.13.3.tar.gz) = SmDqxIu0q0Uzt/gptaUoaJdt+EB0Sdqz2lod9bCIkBE=
SIZE (libphonenumber-8.13.3.tar.gz) = 14755514

View File

@ -11,8 +11,8 @@ Index: cpp/CMakeLists.txt
# Pick the C++ standard to compile with.
# Abseil currently supports C++11, C++14, and C++17.
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard used to compile this project")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard used to compile this project")
set(CMAKE_CXX_STANDARD_REQUIRED ON)
project (libphonenumber)
@ -25,16 +25,7 @@ Index: cpp/CMakeLists.txt
find_or_build_gtest ()
if (${USE_RE2} STREQUAL "ON")
@@ -356,7 +358,7 @@ add_metadata_gen_target (
${TEST_METADATA_TARGET}
"${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml"
"test_metadata"
- "metadata"
+ "test_metadata"
)
list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc")
@@ -386,7 +388,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
@@ -388,7 +390,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
endif ()
if (NOT WIN32)

View File

@ -3,38 +3,41 @@
Index: tools/cpp/CMakeLists.txt
--- tools/cpp/CMakeLists.txt.orig
+++ tools/cpp/CMakeLists.txt
@@ -26,30 +26,7 @@ project (generate_geocoding_data)
@@ -26,33 +26,7 @@ project (generate_geocoding_data)
# Helper functions dealing with finding libraries and programs this library
# depends on.
include (gtest.cmake)
-include (FetchContent)
-# Downloading the abseil sources.
-FetchContent_Declare(
- abseil-cpp
- GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
- GIT_TAG origin/master
-)
-if(NOT absl_FOUND)
- # Downloading the abseil sources at particular version to not catch up
- # with its new build requirements like min C++14 is mandated in that lib.
- FetchContent_Declare(
- abseil-cpp
- GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
- GIT_TAG 273292d
- )
-
-# Building the abseil binaries
-FetchContent_GetProperties(abseil-cpp)
-if (NOT abseil-cpp_POPULATED)
- FetchContent_Populate(abseil-cpp)
-endif ()
- # Building the abseil binaries
- FetchContent_GetProperties(abseil-cpp)
- if (NOT abseil-cpp_POPULATED)
- FetchContent_Populate(abseil-cpp)
- endif ()
-
-if (NOT abseil-cpp_POPULATED)
- message (FATAL_ERROR "Could not build abseil-cpp binaries.")
-endif ()
- if (NOT abseil-cpp_POPULATED)
- message (FATAL_ERROR "Could not build abseil-cpp binaries.")
- endif ()
-
-# Safeguarding against any potential link errors as mentioned in
-# https://github.com/abseil/abseil-cpp/issues/225
-set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-add_subdirectory(${abseil-cpp_SOURCE_DIR} ${abseil-cpp_BINARY_DIR})
- # Safeguarding against any potential link errors as mentioned in
- # https://github.com/abseil/abseil-cpp/issues/225
- set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
- add_subdirectory(${abseil-cpp_SOURCE_DIR} ${abseil-cpp_BINARY_DIR})
-endif()
-
find_or_build_gtest ()
set (
SOURCES
@@ -58,7 +35,7 @@ set (
@@ -61,7 +35,7 @@ set (
)
if (NOT WIN32)