From nobody Thu Sep 21 18:54:27 2023 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 4Rs4M74qycz4tr8D; Thu, 21 Sep 2023 18:54:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs4M74KSkz3PdP; Thu, 21 Sep 2023 18:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695322467; 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=WYXwD0MARNPS0HFFUWB7wM8ODFvoBtWD9OkOpTwdvK8=; b=FmkUroxLcFU1Ikvxngh4HBSsK5x3umySiIV4aSzCGnPx5LYIphnrxMWVgzJQxV7PDS2UDh Gk3eSAt77omp2ZnF28XnfY1/8jZcLHF3kfdCIDvGa83Dbwf7uj51NcUKstl3QfkBf48SwT hX1b/F4laJmIWxhbRljz/zx8Z9ccor9i49/vSIUlbDTPEtuK8iGcRRB23GN/hI9SXU6Ff8 WzBbU4Ek7GnwN7qE2NhQv8fNYa5WUbiVb/hrycSMuswSVlkJh9ixajogzgH2kIecyYZTw7 KhVodx1vCGmzsX1ZsOymp0nEx5WF0Vbt+GhKOTrRH/zfpEl2EQr5gVeg1L/Eeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695322467; a=rsa-sha256; cv=none; b=tyR7jeq+LpF/vd82xF8GE9dKSLWCeXV7ECBceScZOlsHQbrMcYBUt3aQl3nS5HwKKqnbCe Zbqok8QILoqWMV/Hrkc89tHzLgYbMjZRU+bhMlG93lz8KfsU7OWh+mj95vCqy1SILpcnAW 1wwqAkU9WhAX1G/wHKHqrnbUW7+WPZZbgZY2d/1R0zcs9JUc7e34E9afhQt1PIb94NPipY OaNyvFphPO137VoQdLPzR+EJC9zV/T/w3RFzgq4vevJLNcpguNf1gEJRy3C+drhcXw1kX5 rhZhEacuCfbmnN1nMPpbwKPFX9bYiByZLkvlcWcVt+UFcq+yNYgN2nlm2+u82A== 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=1695322467; 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=WYXwD0MARNPS0HFFUWB7wM8ODFvoBtWD9OkOpTwdvK8=; b=HItHVNK9mhJcpKRoZIn60vDUONR7Ytn0/9xRhTlMQRsaO4dguJBgzxQ//oqaw9FxvYeq15 pzLpgC3gqjHMjSN4CIpP7ZKy8II35jPhMPViSZWJlglRPpNho4ISFxw/JGIEhDEjZsgCDN tAkcwvSd5mBnu3ws5O/eVQCAVMLVQpnzGWgysOWTK7PnYd6ZfdIJnD/4n+qPbmyxrdkXR5 rkCyNjjUE8t48U88FCSvKhFS48/FbwHHAAkqpBEuz+w/zkN2QgtQEPloaCrIbqW3/brS1/ zykqgtEkiWyl//fAyFlBv4bBF1rZy58tyXGoDIq2U5SFK8s+NG33lgxqitEv3w== 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 4Rs4M73QHvzqmF; Thu, 21 Sep 2023 18:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LIsR45040920; Thu, 21 Sep 2023 18:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LIsR0q040917; Thu, 21 Sep 2023 18:54:27 GMT (envelope-from git) Date: Thu, 21 Sep 2023 18:54:27 GMT Message-Id: <202309211854.38LIsR0q040917@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: 838e3d8ea34c - main - devel/libphonenumber: Update to 8.13.21 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 838e3d8ea34c054075ddf8cbb6b4048c735dcc80 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=838e3d8ea34c054075ddf8cbb6b4048c735dcc80 commit 838e3d8ea34c054075ddf8cbb6b4048c735dcc80 Author: Jason E. Hale AuthorDate: 2023-09-21 18:45:37 +0000 Commit: Jason E. Hale CommitDate: 2023-09-21 18:54:18 +0000 devel/libphonenumber: Update to 8.13.21 https://github.com/google/libphonenumber/releases/tag/v8.13.21 --- devel/libphonenumber/Makefile | 6 +++++- devel/libphonenumber/distinfo | 6 +++--- devel/libphonenumber/files/patch-CMakeLists.txt | 13 ++----------- devel/libphonenumber/files/patch-tools_CMakeLists.txt | 18 ------------------ 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile index 3848319e39d6..5010a463b401 100644 --- a/devel/libphonenumber/Makefile +++ b/devel/libphonenumber/Makefile @@ -1,6 +1,6 @@ PORTNAME= libphonenumber DISTVERSIONPREFIX= v -DISTVERSION= 8.13.20 +DISTVERSION= 8.13.21 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org @@ -16,6 +16,10 @@ LIB_DEPENDS= libabsl_strings.so:devel/abseil \ libprotobuf.so:devel/protobuf USES= cmake:noninja compiler:c++17-lang pkgconfig +# Workaround CMAKE_ARGS+=-DABSL_PROPAGATE_CXX_STD:BOOL=ON not being set in the +# devel/abseil Makefile. As of version 8.13.21, libphonenumber no longer sets +# the C++ dialect and expects to inherit it from abseil. +USE_CXXSTD= c++17 USE_GITHUB= yes GH_ACCOUNT= google diff --git a/devel/libphonenumber/distinfo b/devel/libphonenumber/distinfo index 3c93979d3876..2bb39b189d85 100644 --- a/devel/libphonenumber/distinfo +++ b/devel/libphonenumber/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1694524567 -SHA256 (google-libphonenumber-v8.13.20_GH0.tar.gz) = 81ac6371367912463c612a4b4a6942ab10b7faf800b8dc026d6db3d157bed9b5 -SIZE (google-libphonenumber-v8.13.20_GH0.tar.gz) = 14810379 +TIMESTAMP = 1695283658 +SHA256 (google-libphonenumber-v8.13.21_GH0.tar.gz) = bca757a8e04849c8158bbbc243c500699daa7601d1fd23a1277fc2643188b44b +SIZE (google-libphonenumber-v8.13.21_GH0.tar.gz) = 14809594 diff --git a/devel/libphonenumber/files/patch-CMakeLists.txt b/devel/libphonenumber/files/patch-CMakeLists.txt index 84b597363642..f91ae68395d1 100644 --- a/devel/libphonenumber/files/patch-CMakeLists.txt +++ b/devel/libphonenumber/files/patch-CMakeLists.txt @@ -1,15 +1,6 @@ ---- CMakeLists.txt.orig 2023-01-06 10:17:24 UTC +--- CMakeLists.txt.orig 2023-09-19 04:20:31 UTC +++ CMakeLists.txt -@@ -20,7 +20,7 @@ project (libphonenumber VERSION 8.13.0) - - # Pick the C++ standard to compile with. - # Abseil currently supports C++11, C++14, and C++17. --set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard used to compile this project") -+set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard used to compile this project") - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - -@@ -106,7 +106,7 @@ endif () +@@ -100,7 +100,7 @@ endif () endif () # Find all the required libraries and programs. diff --git a/devel/libphonenumber/files/patch-tools_CMakeLists.txt b/devel/libphonenumber/files/patch-tools_CMakeLists.txt deleted file mode 100644 index 1f2c04eb002b..000000000000 --- a/devel/libphonenumber/files/patch-tools_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -This patch applies from WRKSRC_SUBDIR, ie. from cpp/ , but even -when building in that subdir, the tools/ directory is built -as well. That is why the patch applies to .. - -- use system abseil instead of fetching it on our own. -- force C++17 because abseil has it, too. - ---- ../tools/cpp/CMakeLists.txt.orig 2022-01-11 10:41:37.000000000 +0100 -+++ ../tools/cpp/CMakeLists.txt 2022-01-22 17:06:39.284013000 +0100 -@@ -18,7 +18,7 @@ - - # Pick the C++ standard to compile with. - # Abseil currently supports C++11, C++14, and C++17. --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - project (generate_geocoding_data)