From 2c3ab3e8f600e860cae4f3e1bf540159e98e084e Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 1 Mar 2022 01:13:53 +0000
Subject: [PATCH] community/libphonenumber: upgrade to 8.12.44

---
 community/libphonenumber/APKBUILD            |  9 +++--
 community/libphonenumber/system-abseil.patch | 41 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 community/libphonenumber/system-abseil.patch

diff --git a/community/libphonenumber/APKBUILD b/community/libphonenumber/APKBUILD
index e589b474489..4fe8706ef54 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.39
-pkgrel=1
+pkgver=8.12.44
+pkgrel=0
 pkgdesc="Library for parsing, formatting, and validating international phone numbers."
 url="https://github.com/google/libphonenumber"
 arch="all"
@@ -13,6 +13,7 @@ depends_dev="
 	protobuf-dev
 	"
 makedepends="$depends_dev
+	abseil-cpp-dev
 	cmake
 	gtest-dev
 	ninja
@@ -21,6 +22,7 @@ checkdepends="gtest"
 subpackages="$pkgname-static $pkgname-dev"
 source="https://github.com/google/libphonenumber/archive/v$pkgver/libphonenumber-v$pkgver.tar.gz
 	cmake-duplicate-rule-definition.patch
+	system-abseil.patch
 	"
 
 build() {
@@ -44,6 +46,7 @@ package() {
 }
 
 sha512sums="
-82570c60b132022a713c0664de2c29997cff0ab8c3ab97dbec0f8d1cd1782090ba92ca7d2f044760f523c986660f13b70aacf8a9c247a3b80eb19d35227bc2a8  libphonenumber-v8.12.39.tar.gz
+3343fb1f8a41d4fcd056de3d6a66ab938a81fde7f006d8e9805a4903d9779fd781cdab779649b75efe8860ff979df60b386afdc2c0aab5e66a350ce723a6371e  libphonenumber-v8.12.44.tar.gz
 dc76f0649c401ec97a7449373b96247135c3b80cf1e5bb8afba005fed1055a74429d3c778b7519b609bdcfbb278be395ef83e0bd00228239b6f15d96b0d2df11  cmake-duplicate-rule-definition.patch
+b6d2eed233817810676a74c50533968029784b4ea0e16c45a31520e5bb5965518455ec0b2e0ef61c652ce52b840b9d6514b0a26c4941056a7dbff359303610d8  system-abseil.patch
 "
diff --git a/community/libphonenumber/system-abseil.patch b/community/libphonenumber/system-abseil.patch
new file mode 100644
index 00000000000..370616920ff
--- /dev/null
+++ b/community/libphonenumber/system-abseil.patch
@@ -0,0 +1,41 @@
+--- 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 (
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -33,6 +33,8 @@
+   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
+ endif ()
+ 
++find_package(absl REQUIRED CONFIG)
++
+ # Helper functions dealing with finding libraries and programs this library
+ # depends on.
+