From nobody Thu Mar 06 01:56:56 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z7XbY1lqVz5pC0R; Thu, 06 Mar 2025 01:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7XbX281Xz3Ppk; Thu, 06 Mar 2025 01:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741226216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PUEGxlFaSKAQaRrrNLAzB487FEQR8ReLYdX2I+bfKGc=; b=slzUXldWaDASDMMHD2JwKMGsUY+PqXzu7GIxY2Bv+CZnZkqdtvjTGlNgh+z7alIDkIY3pF pxIpEFaHP1PNfmV9c/KfRHIA512d+sXb+V8t3gS0MC9EwqHduXveNk5xeV4qViuVMo/OYE 0yOBt0eEwPeWk0sP60nOR9I0F5f99vhoA2/+qnJE1a33QqCQjDreXSjOsLWL3v4Rs02q0f ZcbfjYjvhWBr/sAWCPsjFRhAGAKucujC2CysEdiM3xrnNLJAWsND63xgaak4M71RxLtH5I QNO4rjSAjusnQwKUrrdM9AGfsZs4v2NWE9fzsoEQL5c4K6JQdEEJxie5MLYFmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741226216; a=rsa-sha256; cv=none; b=yxw0OfbpYSxpIAjz4HNwRtE4rdSd5yi0Z2Za1aW2okwblcKr8vrbgL1jvrM6QXcPmtUOHf Y8UsxiZQaAaTRhuSp8OK2y8pq7LUMyoRG8dN5C/jk9Ps8mwCDqRvHpp6NDtB8CwTYMiqcT GSujtUIRGefqEwPjVRVqXVAin4aLLl8JAwMDcsLJv8gPMIPEkiDbM9/P8mKaHMfDylT8Sw FSxFKwLmdNatpi8YkxtR352hDI0Xj0hx0F/9LTnRF898fYx/nf5I/cMD5tDJZ99Rs31tRd /vtkF9I9zIw+7JAlKhau3h4u5bwERL6BIgfjVdiSBj2FrvXnpZ0/WTEzf/uUGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741226216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PUEGxlFaSKAQaRrrNLAzB487FEQR8ReLYdX2I+bfKGc=; b=yy6fZjBE+gUsrEZkuOVDuDkWg/+kMYMRVHqq6AbWAcTs8/o1LSEE5wZp1VLh+LxCmHgRCQ PZu5ymmkialhvfrwPdOuaAu/eg49+u8s5ELjYxdF784dOELW5Nu97MKk2uLn1eTb67Jewu Hy6MrBhdUpNQNHOqY6BKTUt+tv1fvTc5swOp87/5uCbhJt9R5+xF+tF+uzuzpdSxcx931h yrkisbZ+6NgMmJbV0UBbYAgyu9BoZVMIdgx9Ok5aSPyuk1YoNdEsZoUd6yVpUrqfUHFMlr r5DH9fk/InY1SHK++jrL6QQKtQFgMQdaoU+uhofwzQDQaEt4XaBNRiRdJfsUvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z7XbX1kzczVR2; Thu, 06 Mar 2025 01:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5261uuJj089757; Thu, 6 Mar 2025 01:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5261uu92089754; Thu, 6 Mar 2025 01:56:56 GMT (envelope-from git) Date: Thu, 6 Mar 2025 01:56:56 GMT Message-Id: <202503060156.5261uu92089754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: e0e9da7f91f9 - main - devel/libphonenumber: Restore header patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0e9da7f91f91dfe9b8a617dc4c6fe27c06399da Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0e9da7f91f91dfe9b8a617dc4c6fe27c06399da commit e0e9da7f91f91dfe9b8a617dc4c6fe27c06399da Author: Jason E. Hale AuthorDate: 2025-03-06 01:50:30 +0000 Commit: Jason E. Hale CommitDate: 2025-03-06 01:56:50 +0000 devel/libphonenumber: Restore header patches Fixes issue with net/kitinerary /usr/local/include/phonenumbers/base/thread_checker.h:29:2: error: Building without Boost, please provide -DI18N_PHONENUMBERS_NO_THREAD_SAFETY PR: 285187 Reported by: Chad Jacob Milios Fixes: a7845f82f019 devel/libphonenumber: Update to 9.0.0 --- devel/libphonenumber/Makefile | 4 ++-- .../patch-src_phonenumbers_base_memory_singleton.h | 11 +++++++++++ ...atch-src_phonenumbers_base_synchronization_lock.h | 11 +++++++++++ .../patch-src_phonenumbers_base_thread__checker.h | 20 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile index 80e6a308b2d4..5e6cdafd4816 100644 --- a/devel/libphonenumber/Makefile +++ b/devel/libphonenumber/Makefile @@ -1,6 +1,7 @@ PORTNAME= libphonenumber DISTVERSIONPREFIX= v DISTVERSION= 9.0.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org @@ -20,8 +21,7 @@ USES= cmake:testing compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= google -CMAKE_ON= USE_POSIX_THREAD \ - USE_STD_MAP +CMAKE_ON= USE_STD_MAP CMAKE_OFF= REGENERATE_METADATA \ BUILD_TESTING CMAKE_TESTING_TARGET= tests diff --git a/devel/libphonenumber/files/patch-src_phonenumbers_base_memory_singleton.h b/devel/libphonenumber/files/patch-src_phonenumbers_base_memory_singleton.h new file mode 100644 index 000000000000..027519d02fb3 --- /dev/null +++ b/devel/libphonenumber/files/patch-src_phonenumbers_base_memory_singleton.h @@ -0,0 +1,11 @@ +--- src/phonenumbers/base/memory/singleton.h.orig 2020-06-18 13:06:40 UTC ++++ src/phonenumbers/base/memory/singleton.h +@@ -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(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) + #include "phonenumbers/base/memory/singleton_posix.h" + #elif defined(WIN32) + #include "phonenumbers/base/memory/singleton_win32.h" diff --git a/devel/libphonenumber/files/patch-src_phonenumbers_base_synchronization_lock.h b/devel/libphonenumber/files/patch-src_phonenumbers_base_synchronization_lock.h new file mode 100644 index 000000000000..6eece4219c57 --- /dev/null +++ b/devel/libphonenumber/files/patch-src_phonenumbers_base_synchronization_lock.h @@ -0,0 +1,11 @@ +--- src/phonenumbers/base/synchronization/lock.h.orig 2020-06-18 13:06:40 UTC ++++ src/phonenumbers/base/synchronization/lock.h +@@ -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(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) + #include "phonenumbers/base/synchronization/lock_posix.h" + #elif defined(WIN32) + #include "phonenumbers/base/synchronization/lock_win32.h" diff --git a/devel/libphonenumber/files/patch-src_phonenumbers_base_thread__checker.h b/devel/libphonenumber/files/patch-src_phonenumbers_base_thread__checker.h new file mode 100644 index 000000000000..e1f2d7dd9691 --- /dev/null +++ b/devel/libphonenumber/files/patch-src_phonenumbers_base_thread__checker.h @@ -0,0 +1,20 @@ +--- src/phonenumbers/base/thread_checker.h.orig 2025-02-27 13:36:44 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__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \ ++#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \ + !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \ + !((__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)) && \ + !defined(WIN32) +@@ -33,7 +33,7 @@ + #endif + + #if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \ +- (defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)) ++ (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)) + + #include +