From 7806934ffe12a1a08c9d4cd1b2da66966da5679b Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Sun, 22 Jan 2023 14:24:14 +0300 Subject: [PATCH] devel/libphonenumber: update to 8.13.4 release (+) Changelog: https://github.com/google/libphonenumber/blob/v8.13.4/release_notes.txt --- devel/libphonenumber/Makefile | 7 +++++-- devel/libphonenumber/distinfo | 6 +++--- devel/libphonenumber/files/patch-CMakeLists.txt | 15 ++++++++------- devel/libphonenumber/pkg-plist | 12 ++++++++---- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile index 92e5f4c24f961..b64a588706f6c 100644 --- a/devel/libphonenumber/Makefile +++ b/devel/libphonenumber/Makefile @@ -1,7 +1,6 @@ PORTNAME= libphonenumber DISTVERSIONPREFIX= v -DISTVERSION= 8.12.56 -PORTREVISION= 3 +DISTVERSION= 8.13.4 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org @@ -24,4 +23,8 @@ CMAKE_ON= USE_STD_MAP WRKSRC_SUBDIR= cpp +MAKE_JOBS_UNSAFE= yes + +PLIST_SUB= SHLIB_FULL=${PORTVERSION:R} SHLIB_SHORT=${PORTVERSION:R:R} + .include diff --git a/devel/libphonenumber/distinfo b/devel/libphonenumber/distinfo index f467b989c4273..aeb31100fe7c7 100644 --- a/devel/libphonenumber/distinfo +++ b/devel/libphonenumber/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663950424 -SHA256 (google-libphonenumber-v8.12.56_GH0.tar.gz) = 51ec355a7e021e282b5b495ab6729dcef310598caba34c7bada41ae7c14ce919 -SIZE (google-libphonenumber-v8.12.56_GH0.tar.gz) = 14574363 +TIMESTAMP = 1674356278 +SHA256 (google-libphonenumber-v8.13.4_GH0.tar.gz) = 7c9d1b7bc3320e1a234bdd9435486bc01fca181d74455e2866af19543289ae6c +SIZE (google-libphonenumber-v8.13.4_GH0.tar.gz) = 14756476 diff --git a/devel/libphonenumber/files/patch-CMakeLists.txt b/devel/libphonenumber/files/patch-CMakeLists.txt index fa0a848ccac8d..84b597363642d 100644 --- a/devel/libphonenumber/files/patch-CMakeLists.txt +++ b/devel/libphonenumber/files/patch-CMakeLists.txt @@ -1,19 +1,20 @@ ---- CMakeLists.txt.orig 2022-08-04 05:09:57 UTC +--- CMakeLists.txt.orig 2023-01-06 10:17:24 UTC +++ CMakeLists.txt -@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11) +@@ -20,7 +20,7 @@ project (libphonenumber VERSION 8.13.0) # Pick the C++ standard to compile with. # Abseil currently supports C++11, C++14, and C++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) + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - project (libphonenumber) -@@ -101,6 +101,7 @@ if (${USE_ALTERNATE_FORMATS} STREQUAL "ON") +@@ -106,7 +106,7 @@ endif () endif () # Find all the required libraries and programs. +-find_package(absl) +find_package(absl REQUIRED) - if (${USE_BOOST} STREQUAL "ON") - add_definitions ("-DI18N_PHONENUMBERS_USE_BOOST") - if (WIN32) + + if(NOT absl_FOUND) + # Overide abseil install rules for subprojects diff --git a/devel/libphonenumber/pkg-plist b/devel/libphonenumber/pkg-plist index 4814ac2f37ea7..46d95660a6a0d 100644 --- a/devel/libphonenumber/pkg-plist +++ b/devel/libphonenumber/pkg-plist @@ -31,11 +31,15 @@ include/phonenumbers/region_code.h include/phonenumbers/shortnumberinfo.h include/phonenumbers/unicodestring.h include/phonenumbers/utf/unicodetext.h +lib/cmake/libphonenumber/libphonenumber-config-version.cmake +lib/cmake/libphonenumber/libphonenumber-config.cmake +lib/cmake/libphonenumber/libphonenumber-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libphonenumber/libphonenumber-targets.cmake lib/libgeocoding.a lib/libgeocoding.so -lib/libgeocoding.so.8 -lib/libgeocoding.so.8.12 +lib/libgeocoding.so.%%SHLIB_SHORT%% +lib/libgeocoding.so.%%SHLIB_FULL%% lib/libphonenumber.a lib/libphonenumber.so -lib/libphonenumber.so.8 -lib/libphonenumber.so.8.12 +lib/libphonenumber.so.%%SHLIB_SHORT%% +lib/libphonenumber.so.%%SHLIB_FULL%%