[PR PATCH] libphonenumber: update to 8.13.30.

[PR PATCH] libphonenumber: update to 8.13.30.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages libphonenumber
https://github.com/void-linux/void-packages/pull/48897

libphonenumber: update to 8.13.30.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#48892 
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48897.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libphonenumber-48897.patch --]
[-- Type: text/x-diff, Size: 4747 bytes --]

From 51264f8f78541efb85a31981bd2b683a12d2b9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Feb 2024 21:08:31 +0700
Subject: [PATCH 1/3] libphonenumber: update to 8.13.30.

---
 srcpkgs/libphonenumber/patches/32bit.patch        | 10 +---------
 .../patches/cmake-duplicate-rule-definition.patch | 15 ---------------
 srcpkgs/libphonenumber/template                   |  8 +++++---
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch

diff --git a/srcpkgs/libphonenumber/patches/32bit.patch b/srcpkgs/libphonenumber/patches/32bit.patch
index cc5f570be4d7fc..8348f2525ed371 100644
--- a/srcpkgs/libphonenumber/patches/32bit.patch
+++ b/srcpkgs/libphonenumber/patches/32bit.patch
@@ -1,14 +1,6 @@
 --- 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 @@
+@@ -567,7 +567,7 @@
    map<int32, set<string> > country_languages;
    vector<DirEntry> entries;
    if (!ListDirectory(data_path, &entries)) {
diff --git a/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch b/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch
deleted file mode 100644
index cecebae43752c7..00000000000000
--- a/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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")
- 
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 4edd459c6bcf32..df75db75c7ec3e 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
-version=8.12.39
-revision=16
+version=8.13.30
+revision=1
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu
@@ -13,7 +13,9 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/googlei18n/libphonenumber"
 distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz"
-checksum=ff16330f130917e42bc0b1a7efe5e4fba46633bfa62e35268acec855e17e385c
+checksum=126d2680c282107fcb54286fbae5709df84d7ec2e93ce94f3ab4ae373dff6c3e
+
+CXXFLAGS="-D_FILE_OFFSET_BITS=64"
 
 libphonenumber-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} protobuf-devel"

From 9f879134f55f568e2e2ccf4c400dbe44148f599e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Feb 2024 21:09:35 +0700
Subject: [PATCH 2/3] evolution-data-server: rebuild for libphonenumber and
 protobuf

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index e5a2836447d590..0122958402eed4 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.48.4
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc

From f7c641cd19f9ae2ff7328639e28d6796fcc6f564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Feb 2024 21:09:36 +0700
Subject: [PATCH 3/3] kitinerary: rebuild for libphonenumber and protobuf

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 37b78e940f57df..7bd8a316ccc5ac 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.08.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

Re: [PR PATCH] [Updated] libphonenumber: update to 8.13.30.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages libphonenumber
https://github.com/void-linux/void-packages/pull/48897

libphonenumber: update to 8.13.30.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#48892 
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48897.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libphonenumber-48897.patch --]
[-- Type: text/x-diff, Size: 4737 bytes --]

From c52ca43c65ec278e85bc9d3f1151558e0bfb126c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Feb 2024 21:08:31 +0700
Subject: [PATCH 1/3] libphonenumber: update to 8.13.30.

---
 srcpkgs/libphonenumber/patches/32bit.patch        | 10 +---------
 .../patches/cmake-duplicate-rule-definition.patch | 15 ---------------
 srcpkgs/libphonenumber/template                   |  8 +++++---
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch

diff --git a/srcpkgs/libphonenumber/patches/32bit.patch b/srcpkgs/libphonenumber/patches/32bit.patch
index cc5f570be4d7f..8348f2525ed37 100644
--- a/srcpkgs/libphonenumber/patches/32bit.patch
+++ b/srcpkgs/libphonenumber/patches/32bit.patch
@@ -1,14 +1,6 @@
 --- 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 @@
+@@ -567,7 +567,7 @@
    map<int32, set<string> > country_languages;
    vector<DirEntry> entries;
    if (!ListDirectory(data_path, &entries)) {
diff --git a/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch b/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch
deleted file mode 100644
index cecebae43752c..0000000000000
--- a/srcpkgs/libphonenumber/patches/cmake-duplicate-rule-definition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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")
- 
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 4edd459c6bcf3..df75db75c7ec3 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
-version=8.12.39
-revision=16
+version=8.13.30
+revision=1
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu
@@ -13,7 +13,9 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/googlei18n/libphonenumber"
 distfiles="https://github.com/google/libphonenumber/archive/refs/tags/v${version}.tar.gz"
-checksum=ff16330f130917e42bc0b1a7efe5e4fba46633bfa62e35268acec855e17e385c
+checksum=126d2680c282107fcb54286fbae5709df84d7ec2e93ce94f3ab4ae373dff6c3e
+
+CXXFLAGS="-D_FILE_OFFSET_BITS=64"
 
 libphonenumber-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} protobuf-devel"

From fdee0981ed7931e55612d3e4e8119380e34d45bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Feb 2024 21:09:35 +0700
Subject: [PATCH 2/3] evolution-data-server: rebuild for libphonenumber and
 protobuf

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index e5a2836447d59..0122958402eed 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.48.4
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc

From 675242bfb34b11e3dcf74cdca5aeba1cab34d688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 23 Feb 2024 21:09:36 +0700
Subject: [PATCH 3/3] kitinerary: rebuild for libphonenumber and protobuf

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 19b95501f99e5..05a7ab4a64a2f 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=23.08.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config
  qt5-host-tools qt5-qmake qt5-tools-devel"

Re: [PR PATCH] [Merged]: libphonenumber: update to 8.13.30.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1106 bytes --]

There's a merged pull request on the void-packages repository

libphonenumber: update to 8.13.30.
https://github.com/void-linux/void-packages/pull/48897

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#48892 
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->