libphonenumber: update to 8.12.39.

closes #30798
This commit is contained in:
John 2021-12-12 00:20:09 +01:00
parent 60fc4ac2e4
commit b14a9a293f
3 changed files with 37 additions and 7 deletions

View file

@ -0,0 +1,19 @@
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc 2021-12-13 14:43:42.507659848 +0100
+++ - 2021-12-13 14:45:11.191139520 +0100
@@ -13,6 +13,7 @@
// limitations under the License.
//
// Author: Patrick Mezard
+#define _FILE_OFFSET_BITS 64
#include "cpp-build/generate_geocoding_data.h"
@@ -567,7 +568,7 @@
map<int32, set<string> > country_languages;
vector<DirEntry> entries;
if (!ListDirectory(data_path, &entries)) {
- fprintf(stderr, "failed to read directory entries");
+ fprintf(stderr, "failed to read directory entries\n");
return false;
}
for (vector<DirEntry>::const_iterator it = entries.begin();

View file

@ -0,0 +1,15 @@
Work around a deficiency in cmake's build rule generation.
Upstream: not yet
Source: https://git.alpinelinux.org/aports/tree/community/libphonenumber/cmake-duplicate-rule-definition.patch
--- libphonenumber-8.12.20.orig/cpp/CMakeLists.txt
+++ libphonenumber-8.12.20/cpp/CMakeLists.txt
@@ -351,7 +351,7 @@
${TEST_METADATA_TARGET}
"${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml"
"test_metadata"
- "metadata"
+ "test_metadata"
)
list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc")

View file

@ -1,11 +1,11 @@
# Template file for 'libphonenumber' # Template file for 'libphonenumber'
pkgname=libphonenumber pkgname=libphonenumber
version=8.12.38 version=8.12.39
revision=1 revision=1
build_wrksrc=cpp build_wrksrc=cpp
build_style=cmake build_style=cmake
build_helper=qemu build_helper=qemu
make_cmd=make configure_args="-DREGENERATE_METADATA=OFF"
hostmakedepends="pkg-config protobuf" hostmakedepends="pkg-config protobuf"
makedepends="boost-devel gtest-devel icu-devel protobuf-devel" makedepends="boost-devel gtest-devel icu-devel protobuf-devel"
short_desc="Google's common library for handling international phone numbers" short_desc="Google's common library for handling international phone numbers"
@ -13,11 +13,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="Apache-2.0" license="Apache-2.0"
homepage="https://github.com/googlei18n/libphonenumber" homepage="https://github.com/googlei18n/libphonenumber"
distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz" distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz"
checksum=6a57c68550c382ac176715e275d4bed6deac1b5736df2e184e34653da1f141c2 checksum=ff16330f130917e42bc0b1a7efe5e4fba46633bfa62e35268acec855e17e385c
pre_configure() {
export CMAKE_GENERATOR="Unix Makefiles"
}
libphonenumber-devel_package() { libphonenumber-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"