Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libphonenumber 8.13.14 #133508

Closed
wants to merge 6 commits into from
Closed

libphonenumber 8.13.14 #133508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e049f0
libphonenumber 8.13.14
chenrui333 Jun 13, 2023
e738a0a
libphonenumber: try out protobuf
chenrui333 Jun 13, 2023
8670ec5
libphonenumber: add workaround for new protobuf
carlocab Jun 14, 2023
0a09dfb
Merge remote-tracking branch 'origin/master' into bump-libphonenumber…
carlocab Jun 14, 2023
f8c40e4
Revert "libphonenumber: add workaround for new protobuf"
carlocab Jun 14, 2023
29288bd
protobuf: apply upstream fix for thread-local variables
carlocab Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Formula/libphonenumber.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
class Libphonenumber < Formula
desc "C++ Phone Number library by Google"
homepage "https://github.com/google/libphonenumber"
# TODO: Check if we can use unversioned `protobuf` at version bump
url "https://github.com/google/libphonenumber/archive/v8.13.13.tar.gz"
sha256 "5722d25b41ef621849f765121233dcedeb4bca7df87355a21053f893ba7a9a69"
url "https://github.com/google/libphonenumber/archive/v8.13.14.tar.gz"
sha256 "65aa0c7d6da4b070794fb1d7d34f7322e613708c3f10ddd90fe3725e049f1fb0"
license "Apache-2.0"
revision 2

livecheck do
url :stable
Expand All @@ -28,7 +26,7 @@ class Libphonenumber < Formula
depends_on "abseil"
depends_on "boost"
depends_on "icu4c"
depends_on "protobuf@21"
depends_on "protobuf"
depends_on "re2"

fails_with gcc: "5" # For abseil and C++17
Expand Down Expand Up @@ -68,8 +66,7 @@ def install
}
}
EOS
system ENV.cxx, "-std=c++17", "-I#{Formula["protobuf@21"].opt_include}", "test.cpp",
"-L#{lib}", "-lphonenumber", "-o", "test"
system ENV.cxx, "-std=c++17", "test.cpp", "-L#{lib}", "-lphonenumber", "-o", "test"
system "./test"
end
end
Expand Down
9 changes: 8 additions & 1 deletion Formula/protobuf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Protobuf < Formula
homepage "https://protobuf.dev/"
license "BSD-3-Clause"

# TODO: Remove `stable` block when patch is no longer needed.
# TODO: Remove `stable` block when patches are no longer needed.
stable do
url "https://github.com/protocolbuffers/protobuf/releases/download/v23.2/protobuf-23.2.tar.gz"
sha256 "ddf8c9c1ffccb7e80afd183b3bd32b3b62f7cc54b106be190bf49f2bc09daab5"
Expand All @@ -14,6 +14,13 @@ class Protobuf < Formula
url "https://github.com/protocolbuffers/protobuf/commit/fc1c5512e524e0c00a276aa9a38b2cdb8fdf45c7.patch?full_index=1"
sha256 "2ef672ecc95e0b35e2ef455ebbbaaaf0d5a89a341b5bbbe541c6285dfca48508"
end

# Use the same ABI for static and shared objects.
# https://github.com/protocolbuffers/protobuf/pull/12983
patch do
url "https://github.com/protocolbuffers/protobuf/commit/4329fde9cf3fab7d1b3a9abe0fbeee1ad8a8b111.patch?full_index=1"
sha256 "03c52f9207618fcb91cdb8b21dea4b447edcc6ea041f1837b5ff873e6c283b80"
end
end

livecheck do
Expand Down