aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptrcnull <git@ptrcnull.me>2022-08-21 06:04:29 +0200
committerBart Ribbers <bribbers@disroot.org>2022-08-21 08:56:49 +0000
commit5b1c439e939601d2ebc6e82fb4280eff896c1cf2 (patch)
tree169fbba31cda64ce68860d8bd1681fff2d637a82
parentff05f41f1daa27d04276db118e422895748ed39c (diff)
downloadaports-5b1c439e939601d2ebc6e82fb4280eff896c1cf2.tar.gz
aports-5b1c439e939601d2ebc6e82fb4280eff896c1cf2.tar.bz2
aports-5b1c439e939601d2ebc6e82fb4280eff896c1cf2.tar.xz
community/libphonenumber: upgrade to 8.12.54
-rw-r--r--community/libphonenumber/APKBUILD12
-rw-r--r--community/libphonenumber/c++17.patch8
-rw-r--r--community/libphonenumber/cmake-duplicate-rule-definition.patch8
-rw-r--r--community/libphonenumber/system-abseil.patch34
4 files changed, 19 insertions, 43 deletions
diff --git a/community/libphonenumber/APKBUILD b/community/libphonenumber/APKBUILD
index 0ab0d5ce21..6029498f51 100644
--- a/community/libphonenumber/APKBUILD
+++ b/community/libphonenumber/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bhushan Shah <bshah@kde.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libphonenumber
-pkgver=8.12.44
-pkgrel=9
+pkgver=8.12.54
+pkgrel=0
pkgdesc="Library for parsing, formatting, and validating international phone numbers."
url="https://github.com/google/libphonenumber"
arch="all"
@@ -47,8 +47,8 @@ package() {
}
sha512sums="
-3343fb1f8a41d4fcd056de3d6a66ab938a81fde7f006d8e9805a4903d9779fd781cdab779649b75efe8860ff979df60b386afdc2c0aab5e66a350ce723a6371e libphonenumber-v8.12.44.tar.gz
-dc76f0649c401ec97a7449373b96247135c3b80cf1e5bb8afba005fed1055a74429d3c778b7519b609bdcfbb278be395ef83e0bd00228239b6f15d96b0d2df11 cmake-duplicate-rule-definition.patch
-b6d2eed233817810676a74c50533968029784b4ea0e16c45a31520e5bb5965518455ec0b2e0ef61c652ce52b840b9d6514b0a26c4941056a7dbff359303610d8 system-abseil.patch
-12aa540caf28e7b6a6ab93c8ddc60753f4ced446f4763ca87809218cdac8209cdc2c3c82b8efda563130b178de14d3c0f9e87f0c7108dddd63c211089ee8331c c++17.patch
+3d0fdaa32e12d6692f9f33776e1d2a85b315eb18315885f4a6c9b4c0ae93800c1afc89d5bdf93f82c5adbea5cb9b2915e1a146529c41a26890567747cabc0011 libphonenumber-v8.12.54.tar.gz
+40a2ff8d5c35724be0b996c0e11769c45211a85c7a295cf2eca1fe981b4649f194d0e4f3a5a698e02449c82536114d5f792b796ec69caf43dc21e4aa2b825f9c cmake-duplicate-rule-definition.patch
+03c1eb32208a868bcacf92eb42b1f3f009bcc898fa6446594a3e79baadbef5fb53bbe829adfb7d0c8ebebdd37898c6686ff837320d258cd47ef5de7a6bf341bc system-abseil.patch
+a8fb8cf592f3bd8c6b7c3bd3771fdb83e39dec2e546f6071074dfc27857ab0d39523086455b8626d8f1c90069eddf61568d9fc698923c20cbf398bcc4bb9a3f8 c++17.patch
"
diff --git a/community/libphonenumber/c++17.patch b/community/libphonenumber/c++17.patch
index 202e331594..efff5656fb 100644
--- a/community/libphonenumber/c++17.patch
+++ b/community/libphonenumber/c++17.patch
@@ -1,13 +1,15 @@
Use c++17 as abseil-cpp now compiled with c++17
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 434c593..5ae919b 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11)
# 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)
diff --git a/community/libphonenumber/cmake-duplicate-rule-definition.patch b/community/libphonenumber/cmake-duplicate-rule-definition.patch
index 18d8175e10..cafd07a71d 100644
--- a/community/libphonenumber/cmake-duplicate-rule-definition.patch
+++ b/community/libphonenumber/cmake-duplicate-rule-definition.patch
@@ -1,9 +1,11 @@
Work around a deficiency in cmake's build rule generation.
Upstream: not yet
---- libphonenumber-8.12.20.orig/cpp/CMakeLists.txt
-+++ libphonenumber-8.12.20/cpp/CMakeLists.txt
-@@ -351,7 +351,7 @@
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 434c593..b3ecc4f 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -358,7 +358,7 @@ add_metadata_gen_target (
${TEST_METADATA_TARGET}
"${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml"
"test_metadata"
diff --git a/community/libphonenumber/system-abseil.patch b/community/libphonenumber/system-abseil.patch
index 370616920f..8a017d4fef 100644
--- a/community/libphonenumber/system-abseil.patch
+++ b/community/libphonenumber/system-abseil.patch
@@ -1,36 +1,8 @@
---- a/tools/cpp/CMakeLists.txt
-+++ b/tools/cpp/CMakeLists.txt
-@@ -28,27 +28,7 @@
- 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 ()
--
--# 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_or_build_gtest ()
- set (
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 434c593..ff9ff56 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
-@@ -33,6 +33,8 @@
+@@ -33,6 +33,8 @@ if (32BIT)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
endif ()