diff --git a/Aliases/wxmac@3.1 b/Aliases/wxmac@3.1 deleted file mode 120000 index abdff258ac2..00000000000 --- a/Aliases/wxmac@3.1 +++ /dev/null @@ -1 +0,0 @@ -../Formula/wxmac.rb \ No newline at end of file diff --git a/Aliases/wxwidgets b/Aliases/wxwidgets deleted file mode 120000 index abdff258ac2..00000000000 --- a/Aliases/wxwidgets +++ /dev/null @@ -1 +0,0 @@ -../Formula/wxmac.rb \ No newline at end of file diff --git a/Aliases/wxwidgets@3.1 b/Aliases/wxwidgets@3.1 new file mode 120000 index 00000000000..120f911cb5d --- /dev/null +++ b/Aliases/wxwidgets@3.1 @@ -0,0 +1 @@ +../Formula/wxwidgets.rb \ No newline at end of file diff --git a/Formula/wxmac.rb b/Formula/wxwidgets.rb similarity index 66% rename from Formula/wxmac.rb rename to Formula/wxwidgets.rb index c6e5e641902..ecf4a62f1a6 100644 --- a/Formula/wxmac.rb +++ b/Formula/wxwidgets.rb @@ -1,5 +1,5 @@ -class Wxmac < Formula - desc "Cross-platform C++ GUI toolkit (wxWidgets for macOS)" +class Wxwidgets < Formula + desc "Cross-platform C++ GUI toolkit" homepage "https://www.wxwidgets.org" url "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxWidgets-3.1.5.tar.bz2" sha256 "d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224" @@ -11,21 +11,13 @@ class Wxmac < Formula regex(/^v?(\d+(?:\.\d+)+)$/i) end - bottle do - sha256 cellar: :any, arm64_big_sur: "9080b4b039c1267c300977b6a1bab583717f0829f6858eeec580a55473e25a2f" - sha256 cellar: :any, big_sur: "a4ca829d8774407a89b727677286788c2088c7f5814e4e21b07cd339453f6950" - sha256 cellar: :any, catalina: "1b1e632388b899230f8728e21ac2336e741b8233094bf572e9b5e93e9028efe1" - sha256 cellar: :any, mojave: "1be251946ba9b3c4f5acf14a1c3a99f9a5d06360dce108d62ba495c84594159c" - sha256 cellar: :any_skip_relocation, x86_64_linux: "4e1acbd860a4b0225c8a3e26f938ca5cb2ed281c03b3fae23be99a3e4ea0ca20" - end - depends_on "jpeg" depends_on "libpng" depends_on "libtiff" on_linux do depends_on "pkg-config" => :build - depends_on "gtk+" + depends_on "gtk+3" depends_on "libsm" depends_on "mesa-glu" end @@ -64,13 +56,13 @@ class Wxmac < Formula system "./configure", *args system "make", "install" - # wx-config should reference the public prefix, not wxmac's keg + # wx-config should reference the public prefix, not wxwidgets's keg # this ensures that Python software trying to locate wxpython headers - # using wx-config can find both wxmac and wxpython headers, + # using wx-config can find both wxwidgets and wxpython headers, # which are linked to the same place inreplace "#{bin}/wx-config", prefix, HOMEBREW_PREFIX - # For consistency with the versioned wxmac formulae + # For consistency with the versioned wxwidgets formulae bin.install_symlink "#{bin}/wx-config" => "wx-config-#{version.major_minor}" (share/"wx"/version.major_minor).install share/"aclocal", share/"bakefile" end diff --git a/formula_renames.json b/formula_renames.json index 4554198b484..d67a18dced6 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -144,5 +144,6 @@ "weboob": "woob", "wires": "geckodriver", "wpcli-completion": "wp-cli-completion", + "wxmac": "wxwidgets", "xu4": "scummvm" }