[arch-commits] Commit in libphonenumber/trunk (PKGBUILD libdir.diff)

[Jan Steffens]

    Date: Friday, April 27, 2018 @ 18:26:00
  Author: heftig
Revision: 323074

8.9.4-1

Modified:
  libphonenumber/trunk/PKGBUILD
Deleted:
  libphonenumber/trunk/libdir.diff

-------------+
 PKGBUILD    |   23 ++++++++++-------------
 libdir.diff |   16 ----------------
 2 files changed, 10 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-27 17:06:47 UTC (rev 323073)
+++ PKGBUILD	2018-04-27 18:26:00 UTC (rev 323074)
@@ -2,8 +2,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=libphonenumber
-pkgver=8.8.9
-pkgrel=2
+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)
@@ -10,10 +10,9 @@
 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')
+_commit=0e7c29b96ae37aa9dcae37f18447f184ef00bf85  # tags/v8.9.4^0
+source=("git+$url#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -23,7 +22,6 @@
 prepare() {
   mkdir build
   cd $pkgname
-  patch -Np1 -i ../libdir.diff
 }
 
 build() {
@@ -31,16 +29,15 @@
   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
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build .
 }
 
 check() {
-  cd build
-  ninja tests
+  cmake --build build --target tests
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" cmake --build build --target install
 }

Deleted: libdir.diff
===================================================================
--- libdir.diff	2018-04-27 17:06:47 UTC (rev 323073)
+++ libdir.diff	2018-04-27 18:26:00 UTC (rev 323074)
@@ -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")