Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ports/libphonenumber/fix-absl-with-geocoder-off.patch

This file was deleted.

6 changes: 3 additions & 3 deletions ports/libphonenumber/fix-icui18n-lib-name.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 82cf898..07d3f62 100644
index cdd7a08..627f897 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -149,7 +149,7 @@ set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
@@ -192,7 +192,7 @@ set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
set (ICU_LIB ${ICU_UC_LIB})
# If ICU regexp engine is used or if the geocoder is built, use icui18n as well.
if (${USE_ICU_REGEXP} STREQUAL "ON" OR ${BUILD_GEOCODER} STREQUAL "ON")
if (USE_ICU_REGEXP OR BUILD_GEOCODER)
- find_required_library (ICU_I18N unicode/regex.h icui18n "ICU")
+ find_required_library (ICU_I18N unicode/regex.h icuin "ICU")
check_library_version (PC_ICU_I18N icu-i18n>=4.4)
Expand Down
17 changes: 8 additions & 9 deletions ports/libphonenumber/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/libphonenumber
REF v8.13.1
SHA512 e847c263ccc076070a669334536e8f4fe1b6864e8c0cec9992c430b2728512a96d9cdc3e8f0978b79a9fce64edaed85c369773b58706ca189115375ac5dca597
REF "v${VERSION}"
SHA512 401d6bdfe603ffd994ebb76c8b073e0f0d135390bee72fe4783b5fd9b684e2531af154906f49bf7803d3e720b2d0ccc00fc0ea6fbbd2729556a488c5f5647bee
HEAD_REF master
PATCHES
"fix-re2-identifiers.patch"
"fix-icui18n-lib-name.patch"
"fix-absl-with-geocoder-off.patch"
"remove-build-test.patch" # Make build test a feature in future. For now, temp fix.
"remove-shared-lib.patch" # Needs -DBUILD_GEOCODER=OFF option
# Work on building shared libs in future. For now, temp fix.
fix-find-protobuf.patch
)

Expand All @@ -22,10 +18,13 @@ vcpkg_cmake_configure(
-DREGENERATE_METADATA=OFF
-DUSE_RE2=ON
-DBUILD_GEOCODER=OFF
-DUSE_PROTOBUF_LITE=ON)
-DUSE_PROTOBUF_LITE=ON
-DBUILD_SHARED_LIBS=OFF
-DBUILD_TESTING=OFF)

vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
38 changes: 0 additions & 38 deletions ports/libphonenumber/remove-build-test.patch

This file was deleted.

13 changes: 0 additions & 13 deletions ports/libphonenumber/remove-shared-lib.patch

This file was deleted.

3 changes: 1 addition & 2 deletions ports/libphonenumber/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "libphonenumber",
"version": "8.13.1",
"port-version": 1,
"version": "8.13.7",
"description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
"license": "Apache-2.0",
"supports": "!linux & !osx",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4281,8 +4281,8 @@
"port-version": 0
},
"libphonenumber": {
"baseline": "8.13.1",
"port-version": 1
"baseline": "8.13.7",
"port-version": 0
},
"libplist": {
"baseline": "1.3.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libphonenumber.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8384c5dbad4f7fc159e2e01ebcc1d3202157d963",
"version": "8.13.7",
"port-version": 0
},
{
"git-tree": "1576e79acd6565aa0213fdd3d4839a7575fd16a8",
"version": "8.13.1",
Expand Down