[arch-commits] Commit in libphonenumber/repos/testing-x86_64 (4 files)
Jan Steffens
heftig at gemini.archlinux.org
Sun Apr 24 13:40:05 UTC 2022
Date: Sunday, April 24, 2022 @ 13:40:04
Author: heftig
Revision: 443911
archrelease: copy trunk to testing-x86_64
Added:
libphonenumber/repos/testing-x86_64/PKGBUILD
(from rev 443910, libphonenumber/trunk/PKGBUILD)
libphonenumber/repos/testing-x86_64/absl.diff
(from rev 443910, libphonenumber/trunk/absl.diff)
Deleted:
libphonenumber/repos/testing-x86_64/PKGBUILD
libphonenumber/repos/testing-x86_64/absl.diff
-----------+
PKGBUILD | 98 +++++++++++++++++++++---------------------
absl.diff | 139 ++++++++++++++++++++++++------------------------------------
2 files changed, 105 insertions(+), 132 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-24 13:39:51 UTC (rev 443910)
+++ PKGBUILD 2022-04-24 13:40:04 UTC (rev 443911)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=libphonenumber
-pkgver=8.12.46
-pkgrel=3
-epoch=1
-pkgdesc="Google's common library for parsing, formatting, and validating international phone numbers"
-url="https://github.com/googlei18n/libphonenumber"
-arch=(x86_64)
-license=(Apache)
-depends=(icu protobuf boost-libs abseil-cpp)
-makedepends=(boost cmake gtest git)
-options=(debug)
-_commit=3b8e317bc7e7b332f515b10f16b5b096b9771fad # tags/v8.12.46^0
-source=("git+$url#commit=$_commit" absl.diff)
-sha256sums=('SKIP'
- 'ab519dfe99dba11526a105199a9b090ae3be958d3f179f82eb5a288e358c553c')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^libphonenumber-\|^v//;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- # Use our abseil-cpp
- git apply -3 ../absl.diff
-}
-
-build() {
- CXXFLAGS+=" -Wno-error=deprecated-declarations" # readdir_r deprecation
- CXXFLAGS+=" -Wno-error=unused-variable" # this is nuts
- cmake -S $pkgname/cpp -B build \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib
- cmake --build build
-}
-
-check() {
- cmake --build build --target tests
-}
-
-package() {
- depends+=(libicu{uc,i18n}.so libprotobuf.so libboost_thread.so)
- provides+=(libgeocoding.so libphonenumber.so)
-
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: libphonenumber/repos/testing-x86_64/PKGBUILD (from rev 443910, libphonenumber/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-24 13:40:04 UTC (rev 443911)
@@ -0,0 +1,49 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=libphonenumber
+pkgver=8.12.47
+pkgrel=1
+epoch=1
+pkgdesc="Google's common library for parsing, formatting, and validating international phone numbers"
+url="https://github.com/googlei18n/libphonenumber"
+arch=(x86_64)
+license=(Apache)
+depends=(icu protobuf boost-libs abseil-cpp)
+makedepends=(boost cmake gtest git)
+options=(debug)
+_commit=e43c69d31a1d55391f16a31823482293d7f94703 # tags/v8.12.47^0
+source=("git+$url#commit=$_commit" absl.diff)
+sha256sums=('SKIP'
+ '670d40d4d24eca5a32379bfaf696af1879615f0cc7bdc5801bbeb5cb8b961916')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^libphonenumber-\|^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Use our abseil-cpp
+ git apply -3 ../absl.diff
+}
+
+build() {
+ CXXFLAGS+=" -Wno-error=deprecated-declarations" # readdir_r deprecation
+ CXXFLAGS+=" -Wno-error=unused-variable" # this is nuts
+ cmake -S $pkgname/cpp -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ cmake --build build
+}
+
+check() {
+ cmake --build build --target tests
+}
+
+package() {
+ depends+=(libicu{uc,i18n}.so libprotobuf.so libboost_thread.so)
+ provides+=(libgeocoding.so libphonenumber.so)
+
+ DESTDIR="$pkgdir" cmake --install build
+}
Deleted: absl.diff
===================================================================
--- absl.diff 2022-04-24 13:39:51 UTC (rev 443910)
+++ absl.diff 2022-04-24 13:40:04 UTC (rev 443911)
@@ -1,83 +0,0 @@
-diff --git i/cpp/CMakeLists.txt w/cpp/CMakeLists.txt
-index 588b97177..e3231825f 100644
---- i/cpp/CMakeLists.txt
-+++ w/cpp/CMakeLists.txt
-@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11)
-
- # Pick the C++ standard to compile with.
- # Abseil currently supports C++11, C++14, and C++17.
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
- project (libphonenumber)
-@@ -126,6 +126,8 @@ if (${USE_BOOST} STREQUAL "OFF" AND ${USE_STDMUTEX} STREQUAL "OFF")
- find_package (Threads)
- endif()
-
-+find_package (absl REQUIRED)
-+
- find_or_build_gtest ()
-
- if (${USE_RE2} STREQUAL "ON")
-@@ -477,7 +479,7 @@ endif ()
- # Safeguarding against any potential link errors as mentioned in
- # https://github.com/abseil/abseil-cpp/issues/225
- set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
--list (APPEND LIBRARY_DEPS absl::strings)
-+list (APPEND LIBRARY_DEPS absl::strings absl::node_hash_set)
- list (APPEND COMMON_DEPS absl::synchronization)
-
- if (APPLE)
-@@ -570,7 +572,7 @@ if (NOT WIN32)
- list (APPEND TEST_LIBS pthread)
- endif ()
-
--target_link_libraries (libphonenumber_test ${TEST_LIBS} absl::node_hash_set)
-+target_link_libraries (libphonenumber_test ${TEST_LIBS})
-
- # Unfortunately add_custom_target() can't accept a single command provided as a
- # list of commands.
-@@ -677,7 +679,7 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
- geocoding_test_program
- "test/phonenumbers/geocoding/geocoding_test_program.cc"
- )
-- target_link_libraries (geocoding_test_program geocoding phonenumber absl::node_hash_set)
-+ target_link_libraries (geocoding_test_program geocoding phonenumber)
- endif ()
-
- # Build an RPM
-diff --git i/tools/cpp/CMakeLists.txt w/tools/cpp/CMakeLists.txt
-index b09416569..58a9b3ba0 100644
---- i/tools/cpp/CMakeLists.txt
-+++ w/tools/cpp/CMakeLists.txt
-@@ -26,29 +26,6 @@ project (generate_geocoding_data)
- # Helper functions dealing with finding libraries and programs this library
- # depends on.
- 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 (
Copied: libphonenumber/repos/testing-x86_64/absl.diff (from rev 443910, libphonenumber/trunk/absl.diff)
===================================================================
--- absl.diff (rev 0)
+++ absl.diff 2022-04-24 13:40:04 UTC (rev 443911)
@@ -0,0 +1,56 @@
+diff --git i/cpp/CMakeLists.txt w/cpp/CMakeLists.txt
+index 3899006a..8e7458d9 100644
+--- i/cpp/CMakeLists.txt
++++ w/cpp/CMakeLists.txt
+@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11)
+
+ # Pick the C++ standard to compile with.
+ # Abseil currently supports C++11, C++14, and C++17.
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ project (libphonenumber)
+@@ -126,6 +126,8 @@ if (${USE_BOOST} STREQUAL "OFF" AND ${USE_STDMUTEX} STREQUAL "OFF")
+ find_package (Threads)
+ endif()
+
++find_package (absl REQUIRED)
++
+ find_or_build_gtest ()
+
+ if (${USE_RE2} STREQUAL "ON")
+diff --git i/tools/cpp/CMakeLists.txt w/tools/cpp/CMakeLists.txt
+index b0941656..58a9b3ba 100644
+--- i/tools/cpp/CMakeLists.txt
++++ w/tools/cpp/CMakeLists.txt
+@@ -26,29 +26,6 @@ project (generate_geocoding_data)
+ # Helper functions dealing with finding libraries and programs this library
+ # depends on.
+ 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 (
More information about the arch-commits
mailing list