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

[Jan Steffens]

    Date: Sunday, December 10, 2017 @ 14:15:37
  Author: heftig
Revision: 312045

8.8.8-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-10 13:30:07 UTC (rev 312044)
+++ PKGBUILD	2017-12-10 14:15:37 UTC (rev 312045)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=libphonenumber
-pkgver=8.8.5
+pkgver=8.8.8
 pkgrel=1
 pkgdesc="Google's common library for parsing, formatting, and validating international phone numbers"
 url="https://github.com/googlei18n/libphonenumber"
@@ -10,9 +10,10 @@
 license=(Apache)
 depends=(icu protobuf boost-libs)
 makedepends=(boost cmake gtest git 'java-environment>=9' ninja)
-_commit=b7281d6b5385ccd7717e87a1bf4d2ed017173bdc  # tags/v8.8.5^0
-source=("git+$url#commit=$_commit")
-sha256sums=('SKIP')
+_commit=50bb3905f6269b7fe640b065baea74e9b04f9a44  # tags/v8.8.8^0
+source=("git+$url#commit=$_commit" libdir.diff)
+sha256sums=('SKIP'
+            '289949d0d24265aadb960b513543de21a29350342a40cab494a141dbec8ce39b')
 
 pkgver() {
   cd $pkgname
@@ -21,6 +22,8 @@
 
 prepare() {
   mkdir build
+  cd $pkgname
+  patch -Np1 -i ../libdir.diff
 }
 
 build() {

Added: libdir.diff
===================================================================
--- libdir.diff	                        (rev 0)
+++ libdir.diff	2017-12-10 14:15:37 UTC (rev 312045)
@@ -0,0 +1,16 @@
+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")