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

[Jan Steffens]

    Date: Friday, April 27, 2018 @ 18:29:06
  Author: heftig
Revision: 323075

archrelease: copy trunk to extra-x86_64

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

-------------+
 PKGBUILD    |   89 ++++++++++++++++++++++++++++------------------------------
 libdir.diff |   16 ----------
 2 files changed, 43 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-27 18:26:00 UTC (rev 323074)
+++ PKGBUILD	2018-04-27 18:29:06 UTC (rev 323075)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=libphonenumber
-pkgver=8.8.9
-pkgrel=2
-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)
-makedepends=(boost cmake gtest git 'java-environment>=9' ninja)
-_commit=3ba4394332389c46b28d2e1488713621fc4475d0  # tags/v8.8.9^0
-source=("git+$url#commit=$_commit" libdir.diff)
-sha256sums=('SKIP'
-            '289949d0d24265aadb960b513543de21a29350342a40cab494a141dbec8ce39b')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^libphonenumber-\|^v//;s/-/+/g'
-}
-
-prepare() {
-  mkdir build
-  cd $pkgname
-  patch -Np1 -i ../libdir.diff
-}
-
-build() {
-  cd build
-  CXXFLAGS+=" -Wno-error=deprecated-declarations"  # readdir_r deprecation
-  CXXFLAGS+=" -Wno-error=unused-variable"  # this is nuts
-  cmake ../$pkgname/cpp -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  ninja
-}
-
-check() {
-  cd build
-  ninja tests
-}
-
-package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
-}

Copied: libphonenumber/repos/extra-x86_64/PKGBUILD (from rev 323074, libphonenumber/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-04-27 18:29:06 UTC (rev 323075)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=libphonenumber
+pkgver=8.9.4
+pkgrel=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)
+makedepends=(boost cmake gtest git 'java-environment>=9' ninja)
+_commit=0e7c29b96ae37aa9dcae37f18447f184ef00bf85  # tags/v8.9.4^0
+source=("git+$url#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^libphonenumber-\|^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build
+  cd $pkgname
+}
+
+build() {
+  cd build
+  CXXFLAGS+=" -Wno-error=deprecated-declarations"  # readdir_r deprecation
+  CXXFLAGS+=" -Wno-error=unused-variable"  # this is nuts
+  cmake ../$pkgname/cpp -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build .
+}
+
+check() {
+  cmake --build build --target tests
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+}

Deleted: libdir.diff
===================================================================
--- libdir.diff	2018-04-27 18:26:00 UTC (rev 323074)
+++ libdir.diff	2018-04-27 18:29:06 UTC (rev 323075)
@@ -1,16 +0,0 @@
-diff --git i/cpp/CMakeLists.txt w/cpp/CMakeLists.txt
-index 562c70e3d1f8231b..a77fc4dbddcf6791 100644
---- i/cpp/CMakeLists.txt
-+++ w/cpp/CMakeLists.txt
-@@ -590,9 +590,9 @@ install (FILES "src/phonenumbers/base/synchronization/lock.h"
- get_property (LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
- 
- if ("${LIB64}" STREQUAL "TRUE")
--    set (LIBDIR lib64)
--else ()
-     set (LIBDIR lib)
-+else ()
-+    set (LIBDIR lib32)
- endif ()
- 
- if (${BUILD_STATIC_LIB} STREQUAL "ON")