Merge pull request #171183 from branchvincent/bump-qwt-6.3.0

Homebrew · May 11, 2024 · 02e6e6c · 02e6e6c
2 parents daf77d7 + 8a5e512
commit 02e6e6c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 35 deletions.
diff --git a/Formula/g/gnuradio.rb b/Formula/g/gnuradio.rb
@@ -6,7 +6,7 @@ class Gnuradio < Formula
   url "https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.9.2.tar.gz"
   sha256 "7fa154c423d01494cfa4c739faabad70b97f605238cd3fea8907b345b421fea1"
   license "GPL-3.0-or-later"
-  revision 3
+  revision 4
   head "https://github.com/gnuradio/gnuradio.git", branch: "main"
 
   livecheck do
@@ -15,13 +15,13 @@ class Gnuradio < Formula
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "690eb8d0add61400d3e36b3a2b6dc292d3aa38e2e1520c2798b4aedf432fb92d"
-    sha256 cellar: :any,                 arm64_ventura:  "915a1dbe2a75cc936de4f692d4afc35c305f82dd7ad6bb6ccc177fc93b84ee3f"
-    sha256 cellar: :any,                 arm64_monterey: "131f3e75197acf448653a14d00207de1cd93913ecd7aeb4a96464e5d695e3ba3"
-    sha256 cellar: :any,                 sonoma:         "c3d933440a30572393d7a17f271b95253d6b1df5058e10a151714ee5644025e0"
-    sha256 cellar: :any,                 ventura:        "f14c74a2e49a24ecc788f32a2a6ae7aff569ed31e25629e76402afd923983d24"
-    sha256 cellar: :any,                 monterey:       "a81cf9cc23f561fd924e7f9dbf72f3f981248e5693c2eb485b534e4f9087e7b5"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "a89e79fd08c37f0e0e40bb9659bb8c11eb74b5db7956e07ea2d049144f6291c1"
+    sha256 cellar: :any,                 arm64_sonoma:   "7d89cd313db8652bb6d7750b19e48ea375140db44bdb6a9c0f0c58629c86a9a4"
+    sha256 cellar: :any,                 arm64_ventura:  "74ef42bfdef8d7e8d19a85365b28513cb811bd0a542c2b260d97ffb3436fffcb"
+    sha256 cellar: :any,                 arm64_monterey: "5350eb2e872664e4c9d45aedaf079d79169b6b738c52aee335150fc7e9c4a44c"
+    sha256 cellar: :any,                 sonoma:         "e92aacf02b119ecbb87853061add7013c621dd588c381374d716f43116fcc2c3"
+    sha256 cellar: :any,                 ventura:        "6eeae35bb57fa4809f85805ddc18a43ef1d6273264df2be7dddfbf894a700bf9"
+    sha256 cellar: :any,                 monterey:       "40a3d44b596b7ddf19133b1bbd645839a4cf607371e865fd772d386ef506b68b"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "c910cc25ec48ff4971af3655c74b4ec5b91b8ccf9c2cbdaf6afad83f57f48bdd"
   end
 
   depends_on "cmake" => :build
@@ -142,6 +142,12 @@ class Gnuradio < Formula
     sha256 "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8"
   end
 
+  # Allow qwt 6.3+
+  patch do
+    url "https://github.com/gnuradio/gnuradio/commit/ca344658756dab10a762571c51acf92c00c066c1.patch?full_index=1"
+    sha256 "7e16ca70d07ce61bc16870f756acc194eb893e22703c53ed2826f5cf90dc7f4e"
+  end
+
   def python3
     "python3.12"
   end

diff --git a/Formula/q/qwt-qt5.rb b/Formula/q/qwt-qt5.rb
@@ -1,26 +1,22 @@
 class QwtQt5 < Formula
   desc "Qt Widgets for Technical Applications"
   homepage "https://qwt.sourceforge.io/"
-  url "https://downloads.sourceforge.net/project/qwt/qwt/6.2.0/qwt-6.2.0.tar.bz2"
-  sha256 "9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530"
+  url "https://downloads.sourceforge.net/project/qwt/qwt/6.3.0/qwt-6.3.0.tar.bz2"
+  sha256 "dcb085896c28aaec5518cbc08c0ee2b4e60ada7ac929d82639f6189851a6129a"
   license "LGPL-2.1-only" => { with: "Qwt-exception-1.0" }
 
   livecheck do
     formula "qwt"
   end
 
   bottle do
-    rebuild 1
-    sha256 cellar: :any,                 arm64_sonoma:   "1cb860970697ad28b35641bf18fda11fb24b7f6c47dfe4cde6c1093d51d62e53"
-    sha256 cellar: :any,                 arm64_ventura:  "06c70cbba80bbfe1650c3f144c291a40a4489cf096683d6cb1e47bfa75652008"
-    sha256 cellar: :any,                 arm64_monterey: "0269802930f5588330a78fc3a87bc72f18efbca5d2adf14a2ae66af99b8098a3"
-    sha256 cellar: :any,                 arm64_big_sur:  "0a02df654d0c1e813cb9329921d28efec925df351c142c906603a59005726faf"
-    sha256 cellar: :any,                 sonoma:         "d62febe0437854e274675e36a5729e1dc452aa0c6e9413a622d0bdf187d18431"
-    sha256 cellar: :any,                 ventura:        "a4d4365fca136628fd7166f4c3f384a5e10e6ded39b54787cbe5c326b4c2ad11"
-    sha256 cellar: :any,                 monterey:       "4bfd9eb2a914188a9b9bd3c4ff7e4365e23bb67f3efaabaf924d38990c93ea82"
-    sha256 cellar: :any,                 big_sur:        "58547807ea1f43913b4527b0f086c2c1143e57a932609b85a5269b4b02b36b0a"
-    sha256 cellar: :any,                 catalina:       "5e30aa45f92412fcfe90420e2d0fd448a0d5fe21cc356946e96cf62f6695429c"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "ad395d13f89fe9e26818677936e44600a52750af3703d59cfd8323de9888d09c"
+    sha256 cellar: :any,                 arm64_sonoma:   "894d743586ad9e9dcbbb45f9448c6f2fc945aae526f50b2d17e2162b82527402"
+    sha256 cellar: :any,                 arm64_ventura:  "45d280f8c2f948576ed5648f386d99ca4dcefce046a47a07e16255f633a4e49d"
+    sha256 cellar: :any,                 arm64_monterey: "6ba637b0ba53bc6aa54b8373e125706946dcb0f4f0dfefe3a8927d15e52b5a26"
+    sha256 cellar: :any,                 sonoma:         "f99f4ba3c3aec0a92ee319b16bf8478258eecb4fedb0c635a9bbfdb605110adf"
+    sha256 cellar: :any,                 ventura:        "2ee3ad50be50bb89db51bc72219f66fde4cb89638bf0f65b39116ca223b26fb3"
+    sha256 cellar: :any,                 monterey:       "861ae528a6977db8f7588aa055849d5e45e4dbb36b596313ff76d33da4e56de5"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "9a367f75f804b12fd9f2bd9706a47a0f67cd9862035448063e81d9e8ae1c620e"
   end
 
   keg_only "it conflicts with qwt"

diff --git a/Formula/q/qwt.rb b/Formula/q/qwt.rb
@@ -1,28 +1,23 @@
 class Qwt < Formula
   desc "Qt Widgets for Technical Applications"
   homepage "https://qwt.sourceforge.io/"
-  url "https://downloads.sourceforge.net/project/qwt/qwt/6.2.0/qwt-6.2.0.tar.bz2"
-  sha256 "9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530"
+  url "https://downloads.sourceforge.net/project/qwt/qwt/6.3.0/qwt-6.3.0.tar.bz2"
+  sha256 "dcb085896c28aaec5518cbc08c0ee2b4e60ada7ac929d82639f6189851a6129a"
   license "LGPL-2.1-only" => { with: "Qwt-exception-1.0" }
-  revision 1
 
   livecheck do
     url :stable
     regex(%r{url=.*?/qwt[._-]v?(\d+(?:\.\d+)+)\.t}i)
   end
 
   bottle do
-    rebuild 1
-    sha256 cellar: :any,                 arm64_sonoma:   "0f7593ebdd6f36cd40d5e004526ccc50782f8549dee322ee5c02fddbb79348e6"
-    sha256 cellar: :any,                 arm64_ventura:  "8420ce0e8b374e2451d5453e08414ed0eb261b3aeab1cc39602415f5eb7f2f6a"
-    sha256 cellar: :any,                 arm64_monterey: "3788ac401342ed9e2bb65df01a28d1b2d275863078122daf8bc4608e40c7a68d"
-    sha256 cellar: :any,                 arm64_big_sur:  "5298d5e6b9dc707ec137521490cabf0096646539d93c83143b35ec528b785d80"
-    sha256 cellar: :any,                 sonoma:         "e55f39b9d900c9704ef77952d777effe79dd1007348df2e8e571b16968ab6fed"
-    sha256 cellar: :any,                 ventura:        "c73dce9c5fae18ea6c3b294241c28bdd10f5811ee73225289ab0dbae3e4c40e5"
-    sha256 cellar: :any,                 monterey:       "b037d4085bf7072c7bdc4eb370019964460bb42e5070da35e5ecef9e2c020662"
-    sha256 cellar: :any,                 big_sur:        "d9a994f7bff978e0e9907f9fe76f3ba9d73b7055735c00e5ad61cc3b4abcf398"
-    sha256 cellar: :any,                 catalina:       "e21aecb109eea0a86073f60d974d17bff90cfe6800cb3ec51ab3d229467c114e"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "a52c2de9d0a231d153bc7232b6855f02be204ff39d4f6416fb9838d419edfbde"
+    sha256 cellar: :any,                 arm64_sonoma:   "6adb7582cb3f3668fc541f8d087ea1941e1a875ef5d492f74a98c142655236bf"
+    sha256 cellar: :any,                 arm64_ventura:  "a9287c7fd09ae45bd5afc94788679c647b0f0d8b06c2150a8bb32ff19ccc6cb5"
+    sha256 cellar: :any,                 arm64_monterey: "193e2f4e05debf6af85ff273f263f625687855c1608a3273c967aa2923a6c5f6"
+    sha256 cellar: :any,                 sonoma:         "c0e5af00c8bd0937cc15c26ab5882805a523701688b39dfe9a4ae4c00ac79463"
+    sha256 cellar: :any,                 ventura:        "3123515f8b0dc54033fd148442dc8cc92b6d490209c3f474ff29db8abd794bed"
+    sha256 cellar: :any,                 monterey:       "b37d96c837d93dc53dcf9b97592a7f953651acae660b388e8800cffafb9bdcf8"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "84711477f549b6b42ad1ad87bf333e94559836ad3637765c87fb3117f153325c"
   end
 
   depends_on "qt"