From 6a0c41f2e170853891f84e1350d35fd9edbf2ee4 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 31 Aug 2021 16:17:40 -0700 Subject: [PATCH 1/3] gazebo11: depend on qwt-qt5 --- Formula/gazebo11.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/gazebo11.rb b/Formula/gazebo11.rb index 87984c318..e6cd4603a 100644 --- a/Formula/gazebo11.rb +++ b/Formula/gazebo11.rb @@ -31,7 +31,7 @@ class Gazebo11 < Formula depends_on "protobuf" depends_on "protobuf-c" depends_on "qt@5" - depends_on "qwt" + depends_on "qwt-qt5" depends_on "sdformat9" depends_on "tbb@2020_u3" depends_on "tinyxml" @@ -58,8 +58,8 @@ class Gazebo11 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DQWT_WIN_INCLUDE_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework/Headers" - cmake_args << "-DQWT_WIN_LIBRARY_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework" + cmake_args << "-DQWT_WIN_INCLUDE_DIR=#{Formula["qwt-qt5"].opt_lib}/qwt.framework/Headers" + cmake_args << "-DQWT_WIN_LIBRARY_DIR=#{Formula["qwt-qt5"].opt_lib}/qwt.framework" mkdir "build" do system "cmake", "..", *cmake_args From a62fbb0281934fac583ec87e8ae36ce7b176d777 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 31 Aug 2021 16:18:11 -0700 Subject: [PATCH 2/3] gazebo11: revision bump for qwt-qt5 --- Formula/gazebo11.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/gazebo11.rb b/Formula/gazebo11.rb index e6cd4603a..98a48438d 100644 --- a/Formula/gazebo11.rb +++ b/Formula/gazebo11.rb @@ -4,6 +4,7 @@ class Gazebo11 < Formula url "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.8.1.tar.bz2" sha256 "162163f640ccaed319ffd0adb1d766fc7190259f1f3ce507f7d4d86794c87a35" license "Apache-2.0" + revision 1 head "https://github.com/osrf/gazebo.git", branch: "gazebo11" From b6b514c1da2eb91b5ce26cfbcaae2ed47e1ef319 Mon Sep 17 00:00:00 2001 From: OSRF Build Bot Date: Wed, 1 Sep 2021 02:00:40 +0000 Subject: [PATCH 3/3] update bottle. --- Formula/gazebo11.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/gazebo11.rb b/Formula/gazebo11.rb index 98a48438d..18cf26c31 100644 --- a/Formula/gazebo11.rb +++ b/Formula/gazebo11.rb @@ -10,8 +10,8 @@ class Gazebo11 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" - sha256 catalina: "c9e7fce530a5ddadfa28f085b1aa3032d623d662de855fb0361afedc3786d174" - sha256 mojave: "901faabf1743c2580d6d84cd3dfc31d99488d18e3caf8a01be8f456b0b4e32c5" + sha256 catalina: "4c86dadf5dac45b4da3ba9fcd42d5c98f975aa43a2d784f14cac3715c704255b" + sha256 mojave: "fcd7c4827629736f538fe4cb75abdc14d9960818e15f04c232b6ddd22d88310b" end depends_on "cmake" => :build