[packages/libphonenumber] - updated to 8.12.57
qboosh
qboosh at pld-linux.org
Sun Feb 26 17:47:39 CET 2023
commit 279323ce78554d21d160dc6a2327e171323754ba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 26 17:49:29 2023 +0100
- updated to 8.12.57
libphonenumber-no-fetch.patch | 97 +++++++++++++++++++++++++------------------
libphonenumber.spec | 6 +--
2 files changed, 59 insertions(+), 44 deletions(-)
---
diff --git a/libphonenumber.spec b/libphonenumber.spec
index be0eb44..88b9495 100644
--- a/libphonenumber.spec
+++ b/libphonenumber.spec
@@ -7,13 +7,13 @@
Summary: Library to handle international phone numbers
Summary(pl.UTF-8): Biblioteka do obsługi międzynarodowych numerów telefonów
Name: libphonenumber
-Version: 8.12.51
-Release: 2
+Version: 8.12.57
+Release: 1
License: Apache v2.0 with BSD parts
Group: Libraries
#Source0Download: https://github.com/google/libphonenumber/releases/
Source0: https://github.com/google/libphonenumber/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f57a5b475bc5939c7ea04faa6e94d601
+# Source0-md5: f3c5edeb499057960cef5667728fe764
Patch0: %{name}-link.patch
Patch1: %{name}-no-fetch.patch
Patch2: no-static.patch
diff --git a/libphonenumber-no-fetch.patch b/libphonenumber-no-fetch.patch
index 9bcdca9..6e7a2c9 100644
--- a/libphonenumber-no-fetch.patch
+++ b/libphonenumber-no-fetch.patch
@@ -1,38 +1,27 @@
---- libphonenumber-8.12.42/tools/cpp/CMakeLists.txt.orig 2022-01-27 15:51:40.000000000 +0100
-+++ libphonenumber-8.12.42/tools/cpp/CMakeLists.txt 2022-02-08 20:53:10.523844007 +0100
-@@ -26,29 +26,11 @@ 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
--)
--
--# 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 ()
+--- libphonenumber-8.12.57/cpp/CMakeLists.txt.orig 2023-02-26 10:49:15.997683242 +0100
++++ libphonenumber-8.12.57/cpp/CMakeLists.txt 2023-02-26 17:16:58.674991835 +0100
+@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11)
- # 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})
-+find_package(absl REQUIRED COMPONENTS btree strings)
+ # 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)
- find_or_build_gtest ()
- set (
---- libphonenumber-8.12.49/cpp/CMakeLists.txt.orig 2022-06-05 20:00:44.936971698 +0200
-+++ libphonenumber-8.12.49/cpp/CMakeLists.txt 2022-06-05 20:09:04.854263413 +0200
+ project (libphonenumber)
+@@ -202,9 +202,8 @@ add_custom_command (
+ DEPENDS ${PROTOBUF_SOURCES}
+ )
+
++find_package(absl REQUIRED COMPONENTS node_hash_set strings synchronization)
+ if (${BUILD_GEOCODER} STREQUAL "ON")
+- find_package(absl)
+-
+ # Geocoding data cpp file generation
+ set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools")
+ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../tools/cpp" "${TOOLS_DIR}")
+--- libphonenumber-8.12.57/tools/cpp/CMakeLists.txt.orig 2023-02-26 10:49:16.001016558 +0100
++++ libphonenumber-8.12.57/tools/cpp/CMakeLists.txt 2023-02-26 17:39:18.954397584 +0100
@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11)
# Pick the C++ standard to compile with.
@@ -41,12 +30,38 @@
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
- project (libphonenumber)
-@@ -474,6 +474,7 @@ if (${USE_POSIX_THREAD} STREQUAL "ON" OR
- endif()
- endif ()
+ project (generate_geocoding_data)
+@@ -26,32 +26,8 @@ project (generate_geocoding_data)
+ # Helper functions dealing with finding libraries and programs this library
+ # depends on.
+ include (gtest.cmake)
+-include (FetchContent)
-+find_package(absl REQUIRED COMPONENTS node_hash_set strings synchronization)
- # Safeguarding against any potential link errors as mentioned in
- # https://github.com/abseil/abseil-cpp/issues/225
- set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+-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 ()
+-
+- 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})
+-endif()
++find_package(absl REQUIRED COMPONENTS strings btree node_hash_set)
+
+ find_or_build_gtest ()
+ set (
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libphonenumber.git/commitdiff/279323ce78554d21d160dc6a2327e171323754ba
More information about the pld-cvs-commit
mailing list