[arch-commits] Commit in libphonenumber/repos/extra-x86_64 (4 files)
Jan Steffens
heftig at gemini.archlinux.org
Fri May 20 17:02:56 UTC 2022
Date: Friday, May 20, 2022 @ 17:02:56
Author: heftig
Revision: 446146
archrelease: copy trunk to extra-x86_64
Added:
libphonenumber/repos/extra-x86_64/PKGBUILD
(from rev 446145, libphonenumber/trunk/PKGBUILD)
libphonenumber/repos/extra-x86_64/absl.diff
(from rev 446145, libphonenumber/trunk/absl.diff)
Deleted:
libphonenumber/repos/extra-x86_64/PKGBUILD
libphonenumber/repos/extra-x86_64/absl.diff
-----------+
PKGBUILD | 98 ++++++++++++++++++++++++++--------------------------
absl.diff | 112 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 105 insertions(+), 105 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-05-20 16:55:39 UTC (rev 446145)
+++ PKGBUILD 2022-05-20 17:02:56 UTC (rev 446146)
@@ -1,49 +0,0 @@
-# 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
-}
Copied: libphonenumber/repos/extra-x86_64/PKGBUILD (from rev 446145, libphonenumber/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-05-20 17:02:56 UTC (rev 446146)
@@ -0,0 +1,49 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=libphonenumber
+pkgver=8.12.48
+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=4e7922d02168a52963d24756a8ce21c999d7b42e # tags/v8.12.48^0
+source=("git+$url#commit=$_commit" absl.diff)
+sha256sums=('SKIP'
+ 'f6bceb2409ff7cba1e6947e6fdce3fe82b511b04fefcd1f597eceb13af67a8a4')
+
+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-05-20 16:55:39 UTC (rev 446145)
+++ absl.diff 2022-05-20 17:02:56 UTC (rev 446146)
@@ -1,56 +0,0 @@
-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 (
Copied: libphonenumber/repos/extra-x86_64/absl.diff (from rev 446145, libphonenumber/trunk/absl.diff)
===================================================================
--- absl.diff (rev 0)
+++ absl.diff 2022-05-20 17:02:56 UTC (rev 446146)
@@ -0,0 +1,56 @@
+diff --git i/cpp/CMakeLists.txt w/cpp/CMakeLists.txt
+index 57261a63..83440382 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