From e533c2bf3133cc3fec6f78104ed0839fd84e2165 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Wed, 12 Apr 2023 20:29:39 +0200 Subject: [PATCH] libphonenumber: update to 8.13.9 and drop obsolete patch --- recipes-support/libphonenumber.inc | 1 - ...ackage-call-for-absl-to-global-scope.patch | 29 ------------------- ...ber_8.13.3.bb => libphonenumber_8.13.9.bb} | 2 +- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch rename recipes-support/{libphonenumber_8.13.3.bb => libphonenumber_8.13.9.bb} (62%) diff --git a/recipes-support/libphonenumber.inc b/recipes-support/libphonenumber.inc index 3e56a2c..59abf0d 100644 --- a/recipes-support/libphonenumber.inc +++ b/recipes-support/libphonenumber.inc @@ -20,7 +20,6 @@ DEPENDS = " \ SRC_URI = " \ git://github.com/googlei18n/${BPN}.git;nobranch=1;protocol=https \ - file://0001-Move-find_package-call-for-absl-to-global-scope.patch \ " S = "${WORKDIR}/git/cpp" diff --git a/recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch b/recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch deleted file mode 100644 index 9d1b140..0000000 --- a/recipes-support/libphonenumber/0001-Move-find_package-call-for-absl-to-global-scope.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 00ccef439ff8c67e74019d3e55d6e10bd4d87a73 Mon Sep 17 00:00:00 2001 -From: Andreas Cord-Landwehr -Date: Fri, 30 Dec 2022 23:36:00 +0100 -Subject: [PATCH] Move find_package call for absl to global scope - -absl is needed for compilation also with GEOCODER disabled. - -Signed-off-by: Andreas Cord-Landwehr ---- - cpp/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 4ba99c398..a2b33ce54 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,8 +202,8 @@ add_custom_command ( - DEPENDS ${PROTOBUF_SOURCES} - ) - -+find_package(absl REQUIRED) - if (${BUILD_GEOCODER} STREQUAL "ON") -- find_package(absl) - - # Geocoding data cpp file generation - set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools") --- -2.37.2 - diff --git a/recipes-support/libphonenumber_8.13.3.bb b/recipes-support/libphonenumber_8.13.9.bb similarity index 62% rename from recipes-support/libphonenumber_8.13.3.bb rename to recipes-support/libphonenumber_8.13.9.bb index 2e99ccd..98f886e 100644 --- a/recipes-support/libphonenumber_8.13.3.bb +++ b/recipes-support/libphonenumber_8.13.9.bb @@ -2,4 +2,4 @@ # SPDX-License-Identifier: CC0-1.0 require ${PN}.inc -SRCREV = "7f6c068beddd2a07165cce1ab3aa3158789fa3ba" +SRCREV = "84f6152fba5a62fc9acc24bbdec970624a331f7c"