diff options
Diffstat (limited to 'dev-libs/libphonenumber')
5 files changed, 2 insertions, 218 deletions
diff --git a/dev-libs/libphonenumber/Manifest b/dev-libs/libphonenumber/Manifest index 3bc6048550aa..784a76fadaa9 100644 --- a/dev-libs/libphonenumber/Manifest +++ b/dev-libs/libphonenumber/Manifest @@ -1,10 +1,6 @@ -AUX libphonenumber-8.12.37-cmake.patch 1963 BLAKE2B 4ca131a59bb4a5558b01eb1428cf9be4e8c006c85235800f09689960c7c489a4da52d044eb0b11b40172bc37382545f46872f35571b0f349a9749ce21237da64 SHA512 feb365105ad3aa6437b495e0ea86d8050bed06444adb6ce79628186f3d8a5cc67f496b1a73ee8bee049d12e6e108921d76cdfd2d0d1a9095b4d5bc0acf5d2deb -AUX libphonenumber-8.12.37-testing.patch 3349 BLAKE2B 1c96a9efd1919c04ed86ad63713e89ea8a6a21139faaa0b4cff406f0d168c57b981b0af1aedf54e54ed753cfa1c8ea815e78fde86c578c9151bdb5d98e6b4ad2 SHA512 00ed243396507f1d7448faed83f82009de7be1418b499f560b0961ea9796bfe7285d9c04c43dc5f3cd8baa90314a487e377f4fba571c5b492e065a97056ce375 AUX libphonenumber-8.13.47-cmake.patch 1158 BLAKE2B 86ac6e27437caf1d3ba9b961e242076348d1edfe2225d444b95075cf14e426ee2dac5db5b28b4542612378b0757c48c1d02382a8ea8d2f9ce237d3e103e0d1e2 SHA512 3c5b5f47db8a9686a455d446594094eb06cbf717a9687ca7b4542727980cf31a4a8a55ddea23522bb45389e790e68807811f09158746e89becccd25deb44bb09 AUX libphonenumber-8.13.47-protobuf-link-abseil.patch 1090 BLAKE2B 5630942b049fc777f1f9456dffb0d3f14d8938aeac8558dfed58e711dc81956c91890e1757076305f240345d18b5b749b466344b7e818060eac9dca4c789c8e0 SHA512 fd1ec97a487c369cb63b8b644dc23a6e98b71f3f11085286552764f5692393f6a88d700a6bc76c7bca065071b0bb2c1c73eb52a333a37e831983804382734b50 AUX libphonenumber-8.13.47-werror.patch 470 BLAKE2B e122574deb63110d0b8f06d030a0853c1d39f96d67cd1104181ec8b1dfec76cc1aa41cae4fdab698c622da3fce93454d8fcc168403b1b319a37a89cd582124a9 SHA512 44bce9b9c48271b33fbc8669a65954436632bd528b7433c333f22d331418f39fe5b688710feeac11fce5e5bddbdf9191ca490ac12f11623f06b919b2e3189e18 -DIST libphonenumber-8.12.39.tar.gz 11007180 BLAKE2B 27a47b35497772740da04cb9b79e1a6b4fd6f9b0d4a89768e1ba9212672f1a0fd06c5837aa8858a4680b5c47ef16721c6ef145d8d2cd77dccbe27bb4b0897dcf SHA512 82570c60b132022a713c0664de2c29997cff0ab8c3ab97dbec0f8d1cd1782090ba92ca7d2f044760f523c986660f13b70aacf8a9c247a3b80eb19d35227bc2a8 DIST libphonenumber-8.13.47.tar.gz 12929410 BLAKE2B 97af74d0c4c3f01baaeca370f0ad8d71abbff58edbb7209d5809e43f0171b0c3a997aa0a190131e935326ac72702706221429bf166e0726a44126bda36bb0169 SHA512 0ad3e59e4972bdb7f3e9abce4f1e2bd2924c21d437e734d6bc752cc86660a8a48b3b15ecd662c406e0279ef1112d9bd53b8ab9a9c4e593d3c8b87f9d6d23a5f7 -EBUILD libphonenumber-8.12.39.ebuild 1172 BLAKE2B 577342f44537a288b296ca90b50545e039fe115824e91784f290a6afb088c7a42b28b265a447341598d576b7d118a361445e95c5fe6212309a363476de0b3524 SHA512 81d721a186dc2d5ae7bbf12635d86d60475777c8ecd0e58e909fe05c9363bc08441c12a296d1d427ce569ffd9313307bd7dbc67ef4e9cb3883f7715ff8e193e0 -EBUILD libphonenumber-8.13.47.ebuild 1386 BLAKE2B 6e8d0a635ba77f219b2a49a79fa54c8f11570d47d7c68af26c23ae3275462fbc566e302fd28d66cb505a7bc0e90e7f2adf9135c20a1e6ebd1979451b06a46b8a SHA512 a1fce4759b79b883a6ae72a916693760e6dfb3eb30d18f3ad0c3e0a87857fb9f45896bc6f8d1e5aca28b8d5593a6a26e315f641227265a8841889cd94ccb8296 +EBUILD libphonenumber-8.13.47.ebuild 1384 BLAKE2B a94d07bb860e4208eaeb0db109e96936b66d58e1bc28c8038b97026c2bc6f5904e73d97db1cb3471235dcc648462ba97017fabaed454321c0089d1adc57464df SHA512 295af4cc1cfa3f88edaa6505fb38e34423b3e22e336872837aaf7dcac8b9492ebffd83bafbd9a3943113cafc74d6468d4b652f1b0530269a0511da87b396b11e MISC metadata.xml 417 BLAKE2B 95de59ae08b1ea02b4e31e2db29ed6e17040d243c0254ae64eaa0c1a4195244063714ebe9f29e0979a9f6be728eecdf47f8bfac77f674128fc37f52eaf8c8896 SHA512 6fc39161d18efec9984fac508c586a579d93ae12a3cd3d4671630af04d8c86db1b86a5f43ac421fa7c0a4b38f7e333676fc36c8066fe08ebe2a92e56f1acb882 diff --git a/dev-libs/libphonenumber/files/libphonenumber-8.12.37-cmake.patch b/dev-libs/libphonenumber/files/libphonenumber-8.12.37-cmake.patch deleted file mode 100644 index bfc7e8701a5d..000000000000 --- a/dev-libs/libphonenumber/files/libphonenumber-8.12.37-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream: no, I probably should, although this patch isn't nice, but - neither is their cmake code - -From a0c72f32b3c318f66975400af81b9b44d8a8d9c7 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Wed, 27 Mar 2019 21:07:22 +0100 -Subject: [PATCH] Fix build with BUILD_STATIC_LIB=ON - ---- - cpp/CMakeLists.txt | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 38ce1f50..dd9399be 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -441,7 +441,9 @@ if (${BUILD_GEOCODER} STREQUAL "ON") - list (APPEND GEOCODER_DEPS ${COMMON_DEPS}) - # Note that the subset of base/ on which the geocoder relies is implemented - # on top of Boost header-only libraries (e.g. scoped_ptr.hpp). -- target_link_libraries (geocoding ${LIBRARY_DEPS}) -+ if (${BUILD_STATIC_LIB} STREQUAL "ON") -+ target_link_libraries (geocoding ${LIBRARY_DEPS}) -+ endif() - target_link_libraries (geocoding-shared ${LIBRARY_DEPS}) - endif () - -@@ -599,7 +601,9 @@ if (BUILD_SHARED_LIB) - endif () - - if (${BUILD_GEOCODER} STREQUAL "ON") -- install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR}) -+ if (${BUILD_STATIC_LIB} STREQUAL "ON") -+ install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR}) -+ endif() - install (TARGETS geocoding-shared LIBRARY DESTINATION ${LIBDIR} ARCHIVE - DESTINATION ${LIBDIR}) - endif () -@@ -611,7 +615,11 @@ if (${BUILD_GEOCODER} STREQUAL "ON") - geocoding_test_program - "test/phonenumbers/geocoding/geocoding_test_program.cc" - ) -- target_link_libraries (geocoding_test_program geocoding phonenumber) -+ if (${BUILD_STATIC_LIB} STREQUAL "ON") -+ target_link_libraries (geocoding_test_program geocoding phonenumber) -+ else () -+ target_link_libraries (geocoding_test_program geocoding-shared phonenumber-shared) -+ endif () - endif () - - # Build an RPM --- -2.21.0 - diff --git a/dev-libs/libphonenumber/files/libphonenumber-8.12.37-testing.patch b/dev-libs/libphonenumber/files/libphonenumber-8.12.37-testing.patch deleted file mode 100644 index 0ea039aea2bd..000000000000 --- a/dev-libs/libphonenumber/files/libphonenumber-8.12.37-testing.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 387f1daf0f9cd25ffa2654cc536e5678dd96a571 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 15 Nov 2021 19:13:37 +0100 -Subject: [PATCH] Add BUILD_TESTING option - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cpp/CMakeLists.txt | 13 +++++++++++-- - tools/cpp/CMakeLists.txt | 17 +++++++++-------- - 2 files changed, 20 insertions(+), 10 deletions(-) - -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 44db6834..f8e40978 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -32,7 +32,9 @@ endif () - # depends on. - - include (GNUInstallDirs) --include (../tools/cpp/gtest.cmake) -+if (BUILD_TESTING) -+ include (../tools/cpp/gtest.cmake) -+endif() - - function (print_error DESCRIPTION FILE) - message (FATAL_ERROR -@@ -90,6 +92,7 @@ option ("USE_STD_MAP" "Force the use of std::map" "OFF") - option ("BUILD_STATIC_LIB" "Build static libraries" "ON") - option ("USE_STDMUTEX" "Use C++ 2011 std::mutex for multi-threading" "OFF") - option ("USE_POSIX_THREAD" "Use Posix api for multi-threading" "OFF") -+option ("BUILD_TESTING" "Build unit tests (gtest sources are needed)" "ON") - - if (${USE_ALTERNATE_FORMATS} STREQUAL "ON") - add_definitions ("-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS") -@@ -121,7 +124,9 @@ if (${USE_BOOST} STREQUAL "OFF" AND ${USE_STDMUTEX} STREQUAL "OFF") - find_package (Threads) - endif() - --find_or_build_gtest () -+if (BUILD_TESTING) -+ find_or_build_gtest () -+endif() - - if (${USE_RE2} STREQUAL "ON") - find_required_library (RE2 re2/re2.h re2 "Google RE2") -@@ -492,11 +497,13 @@ if (${BUILD_GEOCODER} STREQUAL "ON") - endif () - - # Build a specific library for testing purposes. -+if (BUILD_TESTING) - add_library (phonenumber_testing STATIC ${TESTING_LIBRARY_SOURCES}) - if (${BUILD_GEOCODER} STREQUAL "ON") - add_dependencies (phonenumber_testing generate_geocoding_data) - endif () - target_link_libraries (phonenumber_testing ${LIBRARY_DEPS}) -+endif() - - if (${BUILD_GEOCODER} STREQUAL "ON") - # Test geocoding data cpp files generation. -@@ -551,6 +558,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON") - endif () - - # Build the testing binary. -+if (BUILD_TESTING) - include_directories ("test") - add_executable (libphonenumber_test ${TEST_SOURCES}) - set (TEST_LIBS phonenumber_testing ${GTEST_LIB}) -@@ -575,6 +583,7 @@ else () - DEPENDS libphonenumber_test - ) - endif () -+endif () - - # Install rules. - install (FILES -diff --git a/tools/cpp/CMakeLists.txt b/tools/cpp/CMakeLists.txt -index fafa8469..0c3a84e0 100644 ---- a/tools/cpp/CMakeLists.txt -+++ b/tools/cpp/CMakeLists.txt -@@ -20,11 +20,10 @@ project (generate_geocoding_data) - - # Helper functions dealing with finding libraries and programs this library - # depends on. -- --include (gtest.cmake) -- --find_or_build_gtest () -- -+if (BUILD_TESTING) -+ include (gtest.cmake) -+ find_or_build_gtest () -+endif () - set ( - SOURCES - "src/cpp-build/generate_geocoding_data.cc" -@@ -52,6 +51,8 @@ if (NOT WIN32) - endif () - - # Build the testing binary. --include_directories ("test") --add_executable (generate_geocoding_data_test ${TEST_SOURCES}) --target_link_libraries (generate_geocoding_data_test ${TEST_LIBS}) -+if (BUILD_TESTING) -+ include_directories ("test") -+ add_executable (generate_geocoding_data_test ${TEST_SOURCES}) -+ target_link_libraries (generate_geocoding_data_test ${TEST_LIBS}) -+endif () --- -2.33.1 - diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild deleted file mode 100644 index b73f1a758e97..000000000000 --- a/dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR="emake" # broken w/ ninja -inherit cmake - -DESCRIPTION="Library for parsing, formatting, and validating international phone numbers" -HOMEPAGE="https://github.com/google/libphonenumber" -SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="test" - -RESTRICT="test !test? ( test )" - -DEPEND=" - dev-libs/icu:= - dev-libs/protobuf:= - dev-libs/boost:= -" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( dev-cpp/gtest ) -" - -PATCHES=( - # it is either this, or disable BUILD_GEOCODER - # https://github.com/google/libphonenumber/pull/2556 - "${FILESDIR}"/${PN}-8.12.37-cmake.patch - # see also https://github.com/google/libphonenumber/pull/2459 - # using a stripped-down patch w/ BUILD_TESTING - "${FILESDIR}"/${PN}-8.12.37-testing.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_STATIC_LIB=OFF - -DBUILD_TESTING=$(usex test) - -DREGENERATE_METADATA=OFF # avoid JRE dependency - ) - cmake_src_configure -} diff --git a/dev-libs/libphonenumber/libphonenumber-8.13.47.ebuild b/dev-libs/libphonenumber/libphonenumber-8.13.47.ebuild index 97117f5f0dc1..4b72d0de5f2a 100644 --- a/dev-libs/libphonenumber/libphonenumber-8.13.47.ebuild +++ b/dev-libs/libphonenumber/libphonenumber-8.13.47.ebuild @@ -13,7 +13,7 @@ CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" |