gz-gui3, gz-gui6: add protobuf patches (#2288)

* ignition-gui3: revision bump remove bottle Signed-off-by: Steve Peters <[email protected]>
osrf · Jun 13, 2023 · eae89f6 · eae89f6
1 parent 53df59b
commit eae89f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Formula/ignition-gui3.rb b/Formula/ignition-gui3.rb
@@ -4,16 +4,10 @@ class IgnitionGui3 < Formula
  url "https://osrf-distributions.s3.amazonaws.com/ign-gui/releases/ignition-gui3-3.12.0.tar.bz2"
  sha256 "f53ee05d844449b900ecb30d5e1f812fd3f7e9e28630d309b7d8d11add3c3b1c"
  license "Apache-2.0"
- revision 2
+ revision 3
 
  head "https:/gazebosim/gz-gui.git", branch: "ign-gui3"
 
- bottle do
- root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
- sha256 monterey: "73969b7ee975de9e8dd06633a296ec6e3716f6370eb4383c63b821ca42387946"
- sha256 big_sur: "66a23575254348c3ef0c3cf3578d4e04581b4dc9970cc11736208130a53b3131"
- end
-
  deprecate! date: "2024-12-31", because: "is past end-of-life date"
 
  depends_on "cmake" => [:build, :test]
@@ -29,6 +23,12 @@ class IgnitionGui3 < Formula
  depends_on "qt@5"
  depends_on "tinyxml2"
 
+ patch do
+ # Fix for compatibility with protobuf 23.2
+ url "https:/gazebosim/gz-gui/commit/f65395f734df81b22dcd10d68d2802b61d6b72bc.patch?full_index=1"
+ sha256 "50c63503ca4dc48c677e254b3a50a9cffd3ffbee9b6d85a60b36c78a3eb3ba05"
+ end
+
  def install
  cmake_args = std_cmake_args
  cmake_args << "-DBUILD_TESTING=Off"

diff --git a/Formula/ignition-gui6.rb b/Formula/ignition-gui6.rb
@@ -20,6 +20,12 @@ class IgnitionGui6 < Formula
  depends_on "qt@5"
  depends_on "tinyxml2"
 
+ patch do
+ # Fix for compatibility with protobuf 23.2
+ url "https:/gazebosim/gz-gui/commit/f65395f734df81b22dcd10d68d2802b61d6b72bc.patch?full_index=1"
+ sha256 "50c63503ca4dc48c677e254b3a50a9cffd3ffbee9b6d85a60b36c78a3eb3ba05"
+ end
+
  def install
  cmake_args = std_cmake_args
  cmake_args << "-DBUILD_TESTING=Off"