devel/libphonenumber: update to 8.12.6

This commit is contained in:
Tobias C. Berner 2020-06-19 19:46:20 +00:00
parent d1306729ae
commit baf65dcdc4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=539675
6 changed files with 38 additions and 39 deletions

View file

@ -2,7 +2,7 @@
PORTNAME= libphonenumber
DISTVERSIONPREFIX= v
DISTVERSION= 8.12.5
DISTVERSION= 8.12.6
CATEGORIES= devel
MAINTAINER= kde@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1591330476
SHA256 (googlei18n-libphonenumber-v8.12.5_GH0.tar.gz) = 5acc2f679220ba7e1d9f256ff4de470db00949dd60220268ee5d73c720f0ec44
SIZE (googlei18n-libphonenumber-v8.12.5_GH0.tar.gz) = 7743794
TIMESTAMP = 1592595176
SHA256 (googlei18n-libphonenumber-v8.12.6_GH0.tar.gz) = 99525172e34405326a0e882fa51ab03c1cf66297d0ee893d846eae8380090a35
SIZE (googlei18n-libphonenumber-v8.12.6_GH0.tar.gz) = 7977157

View file

@ -1,11 +1,11 @@
--- src/phonenumbers/base/memory/singleton.h.orig 2020-01-18 23:13:06 UTC
--- src/phonenumbers/base/memory/singleton.h.orig 2020-06-18 13:06:40 UTC
+++ src/phonenumbers/base/memory/singleton.h
@@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag
#include "phonenumbers/base/logging.h"
#include "phonenumbers/base/thread_checker.h"
-#if !defined(__linux__) && !defined(__APPLE__)
+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__)
namespace i18n {
namespace phonenumbers {
@@ -22,7 +22,7 @@
#elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
// C++11 Lock implementation based on std::mutex.
#include "phonenumbers/base/memory/singleton_stdmutex.h"
-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
+#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) || defined(__FreeBSD__)
#include "phonenumbers/base/memory/singleton_posix.h"
#elif defined(WIN32)
#include "phonenumbers/base/memory/singleton_win32.h"

View file

@ -1,11 +1,11 @@
--- src/phonenumbers/base/synchronization/lock.h.orig 2020-01-18 23:13:17 UTC
--- src/phonenumbers/base/synchronization/lock.h.orig 2020-06-18 13:06:40 UTC
+++ src/phonenumbers/base/synchronization/lock.h
@@ -63,7 +63,7 @@ class Lock { (private)
// Dummy lock implementation on non-POSIX platforms. If you are running on a
// different platform and care about thread-safety, please compile with
// -DI18N_PHONENUMBERS_USE_BOOST.
-#elif !defined(__linux__) && !defined(__APPLE__)
+#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__)
namespace i18n {
namespace phonenumbers {
@@ -22,7 +22,7 @@
#elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
// C++11 Lock implementation based on std::mutex.
#include "phonenumbers/base/synchronization/lock_stdmutex.h"
-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
+#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) || defined(__FreeBSD__)
#include "phonenumbers/base/synchronization/lock_posix.h"
#elif defined(WIN32)
#include "phonenumbers/base/synchronization/lock_win32.h"

View file

@ -1,20 +1,11 @@
--- src/phonenumbers/base/thread_checker.h.orig 2020-01-18 23:13:13 UTC
--- src/phonenumbers/base/thread_checker.h.orig 2020-06-18 13:06:40 UTC
+++ src/phonenumbers/base/thread_checker.h
@@ -22,7 +22,7 @@
// Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the
// user of the library know that it can't be used in a thread-safe manner when
// it is not depending on Boost.
-#if !defined(__linux__) && !defined(__APPLE__) && \
+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && \
!defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY)
#error Building without Boost, please provide \
-DI18N_PHONENUMBERS_NO_THREAD_SAFETY
@@ -31,7 +31,7 @@
#endif
#if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \
- (defined(__linux__) || defined(__apple__))
+ (defined(__linux__) || defined(__apple__) || defined(__FreeBSD__))
#include <pthread.h>
-#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \
+#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && !defined(__FreeBSD__) \
!defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \
!((__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)) && \
!defined(WIN32)

View file

@ -3,9 +3,17 @@ include/phonenumbers/base/basictypes.h
include/phonenumbers/base/logging.h
include/phonenumbers/base/memory/scoped_ptr.h
include/phonenumbers/base/memory/singleton.h
include/phonenumbers/base/memory/singleton_boost.h
include/phonenumbers/base/memory/singleton_posix.h
include/phonenumbers/base/memory/singleton_stdmutex.h
include/phonenumbers/base/memory/singleton_unsafe.h
include/phonenumbers/base/memory/singleton_win32.h
include/phonenumbers/base/synchronization/lock.h
include/phonenumbers/base/synchronization/lock_boost.h
include/phonenumbers/base/synchronization/lock_posix.h
include/phonenumbers/base/synchronization/lock_stdmutex.h
include/phonenumbers/base/synchronization/lock_unsafe.h
include/phonenumbers/base/synchronization/lock_win32.h
include/phonenumbers/base/template_util.h
include/phonenumbers/base/thread_checker.h
include/phonenumbers/callback.h