[arch-commits] Commit in libphonenumber/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Wednesday, July 20, 2022 @ 14:51:34
  Author: heftig
Revision: 451504

archrelease: copy trunk to extra-x86_64

Added:
  libphonenumber/repos/extra-x86_64/PKGBUILD
    (from rev 451503, libphonenumber/trunk/PKGBUILD)
Deleted:
  libphonenumber/repos/extra-x86_64/PKGBUILD
  libphonenumber/repos/extra-x86_64/absl.diff

-----------+
 PKGBUILD  |   96 +++++++++++++++++++++++++++++-------------------------------
 absl.diff |   56 -----------------------------------
 2 files changed, 47 insertions(+), 105 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-20 14:45:37 UTC (rev 451503)
+++ PKGBUILD	2022-07-20 14:51:34 UTC (rev 451504)
@@ -1,49 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgname=libphonenumber
-pkgver=8.12.50
-pkgrel=2
-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=e1c6752b358569810fb33bcc9f5c75050e9533fe  # tags/v8.12.50^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
-}

Copied: libphonenumber/repos/extra-x86_64/PKGBUILD (from rev 451503, libphonenumber/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-07-20 14:51:34 UTC (rev 451504)
@@ -0,0 +1,47 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=libphonenumber
+pkgver=8.12.52
+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=011d35d28fe8a7c201efe9164f55ebd0a2d43b0c  # tags/v8.12.52^0
+source=("git+$url#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^libphonenumber-\|^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+}
+
+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 \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_CXX_STANDARD=17
+  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-07-20 14:45:37 UTC (rev 451503)
+++ absl.diff	2022-07-20 14:51:34 UTC (rev 451504)
@@ -1,56 +0,0 @@
-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 (