Skip to content

Commit b9e3160

Browse files
scpetersosrfbuild
andauthored
Rebuild Ionic for protobuf 30 (part 2) (#3101)
* gz-fuel-tools10: revision bump rebuild for protobuf * gz-gui9: revision bump rebuild for protobuf * gz-launch8: revision bump and protobuf 30 patch * gz-msgs11: revision bump rebuild for protobuf * gz-sensors9: revision bump rebuild for protobuf * gz-sim9: revision bump rebuild for abseil * gz-transport14: revision bump rebuild for protobuf * update bottle. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: OSRF Build Bot <osrfbuild@osrfoundation.org>
1 parent 4566f20 commit b9e3160

File tree

7 files changed

+55
-7
lines changed

7 files changed

+55
-7
lines changed

Formula/gz-fuel-tools10.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzFuelTools10 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-10.1.0.tar.bz2"
55
sha256 "37ae351be9a9b281d078e36068422dd096f59f46c72c4ef490800dfeb7653e1d"
66
license "Apache-2.0"
7-
revision 7
7+
revision 8
88

99
head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "gz-fuel-tools10"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 cellar: :any, sonoma: "d35df458b6f48f2755c74f8984b659e7d07e0653141e9ca554606c381fbec56f"
14+
sha256 cellar: :any, ventura: "34d770c8633059c51fd33c824260cacdc70834ea1dbe4a763db094c196e391c7"
15+
end
16+
1117
depends_on "abseil"
1218
depends_on "cmake"
1319
depends_on "gz-cmake4"

Formula/gz-gui9.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzGui9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-gui/releases/gz-gui-9.0.1.tar.bz2"
55
sha256 "873d9950b1aa577b5b7f864caa4c3f759e29d5b67b81c4d69ab7d37043c4f96d"
66
license "Apache-2.0"
7-
revision 13
7+
revision 14
88

99
head "https://github.com/gazebosim/gz-gui.git", branch: "gz-gui9"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "1528f634bca496b8b396679ba113444f20977aae3f5bf8fc8470d7766216d91a"
14+
sha256 ventura: "3e7a2dac9350576284241d013d18cf5852d12fe38e96037018744084dd9ffba5"
15+
end
16+
1117
depends_on "cmake" => [:build, :test]
1218
depends_on "pkgconf" => [:build, :test]
1319
depends_on "abseil"

Formula/gz-launch8.rb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzLaunch8 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-launch/releases/gz-launch-8.0.1.tar.bz2"
55
sha256 "ce89cfe1554bf64ea63bbbcd7ce9624dd488a72a688cd620f97cabab776245a7"
66
license "Apache-2.0"
7-
revision 11
7+
revision 12
88

99
head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch8"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "01976946dede62b098d8d31bb48bd9fdc5eb8af14b8a03a8877d29d6d6574a9e"
14+
sha256 ventura: "236c2065fd3dcb34af27aba8344d7cfb62f6d5bf2f52edd037473009438a1777"
15+
end
16+
1117
depends_on "cmake" => :build
1218
depends_on "pkgconf" => :build
1319

@@ -31,6 +37,12 @@ class GzLaunch8 < Formula
3137
depends_on "sdformat15"
3238
depends_on "tinyxml2"
3339

40+
patch do
41+
# Fix for compatibility with protobuf 30
42+
url "https://github.com/gazebosim/gz-launch/commit/ae0a1cd4b7e1f086280f40db88a4bb7152b99b46.patch?full_index=1"
43+
sha256 "a8caa916a19df2881f4e5b956a6fffe651906832151c5d775cb4b88c62f732c6"
44+
end
45+
3446
def install
3547
rpaths = [
3648
rpath,

Formula/gz-msgs11.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzMsgs11 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-msgs/releases/gz-msgs-11.1.0.tar.bz2"
55
sha256 "2343f0975d00fb21dd87de15603161981c920e0e4b33e735863a259f488f36d0"
66
license "Apache-2.0"
7-
revision 6
7+
revision 7
88

99
head "https://github.com/gazebosim/gz-msgs.git", branch: "gz-msgs11"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "417f0aa0a46ac815bc44323d626925af0c64008577c4b6461db6d8c887aaaf54"
14+
sha256 ventura: "f53f4b4763c9e844eeaa4df2b8592f01c1be4be0e5a648677530fa0c2ed52421"
15+
end
16+
1117
depends_on "python@3.12" => [:build, :test]
1218
depends_on "python@3.13" => [:build, :test]
1319
depends_on "abseil"

Formula/gz-sensors9.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzSensors9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-sensors/releases/gz-sensors-9.2.0.tar.bz2"
55
sha256 "af2ec9a453a830338e80e94954160030e81b3ff8f60853e7c5730cdd2950be85"
66
license "Apache-2.0"
7-
revision 5
7+
revision 6
88

99
head "https://github.com/gazebosim/gz-sensors.git", branch: "gz-sensors9"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 cellar: :any, sonoma: "de3fa63727248cb858d630aebfcc04f8f99e80f16c3c343694c4e7f920d1db8b"
14+
sha256 cellar: :any, ventura: "271c6260fc9312c145a5b2b5fe2cf01bda51d5a10e591824d753ce8956213572"
15+
end
16+
1117
depends_on "cmake" => [:build, :test]
1218
depends_on "pkgconf" => [:build, :test]
1319

Formula/gz-sim9.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzSim9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-sim/releases/gz-sim-9.3.0.tar.bz2"
55
sha256 "9edd898fa2ee6b6c0223529b4b0d594bdb576d3ed7e86ef70d7b3869dad59f36"
66
license "Apache-2.0"
7-
revision 2
7+
revision 3
88

99
head "https://github.com/gazebosim/gz-sim.git", branch: "gz-sim9"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "7c544a02fa26f9da009c482de2cc733666c2efe743aee3430c11c7c284fa972e"
14+
sha256 ventura: "ff7515c7a8560e3c774ece332f3ee2fa09b6e8f47c4521055833eea57d598602"
15+
end
16+
1117
depends_on "cmake" => :build
1218
depends_on "pybind11" => :build
1319
depends_on "python@3.13" => [:build, :test]

Formula/gz-transport14.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzTransport14 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-transport/releases/gz-transport-14.1.0.tar.bz2"
55
sha256 "9731f850ea060edecd399c3d8566a4bf998d85ee64fae236db09a542738ed18d"
66
license "Apache-2.0"
7-
revision 5
7+
revision 6
88

99
head "https://github.com/gazebosim/gz-transport.git", branch: "gz-transport14"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "f54a1fc8c7c9ae999156a38b7bc5d97a5466cd74ca2cdd85efc1cc60e24156c9"
14+
sha256 ventura: "babf1f496353c7b1d2649facc51155ca6e03a28c6c2bcebfea3a5549eccf8142"
15+
end
16+
1117
depends_on "doxygen" => [:build, :optional]
1218
depends_on "pybind11" => :build
1319
depends_on "python@3.12" => [:build, :test]

0 commit comments

Comments
 (0)