diff --git a/Aliases/wxmac@3.1 b/Aliases/wxmac@3.1 new file mode 120000 index 00000000000..abdff258ac2 --- /dev/null +++ b/Aliases/wxmac@3.1 @@ -0,0 +1 @@ +../Formula/wxmac.rb \ No newline at end of file diff --git a/Formula/wxmac.rb b/Formula/wxmac.rb index d6d8df4a83a..569e1e3f516 100644 --- a/Formula/wxmac.rb +++ b/Formula/wxmac.rb @@ -1,15 +1,14 @@ class Wxmac < Formula desc "Cross-platform C++ GUI toolkit (wxWidgets for macOS)" homepage "https://www.wxwidgets.org" - url "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5.1/wxWidgets-3.0.5.1.tar.bz2" - sha256 "440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807" + url "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.5/wxWidgets-3.1.5.tar.bz2" + sha256 "d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224" license "wxWindows" - revision 2 head "https://github.com/wxWidgets/wxWidgets.git" livecheck do url :stable - regex(/^v?(\d+\.\d*[02468](?:\.\d+)*)$/i) + regex(/^v?(\d+(?:\.\d+)+)$/i) end bottle do @@ -42,8 +41,7 @@ class Wxmac < Formula "--enable-std_string", "--enable-svg", "--enable-unicode", - "--enable-webkit", - "--enable-webview", + "--enable-webviewwebkit", "--with-expat", "--with-libjpeg", "--with-libpng", @@ -59,6 +57,7 @@ class Wxmac < Formula # Set with-macosx-version-min to avoid configure defaulting to 10.5 args << "--with-macosx-version-min=#{MacOS.version}" args << "--with-osx_cocoa" + args << "--with-libiconv" end system "./configure", *args @@ -69,6 +68,10 @@ class Wxmac < Formula # using wx-config can find both wxmac and wxpython headers, # which are linked to the same place inreplace "#{bin}/wx-config", prefix, HOMEBREW_PREFIX + + # Move some files out of the way to prevent conflict with `wxmac-stable` + bin.install_symlink "#{bin}/wx-config" => "wx-config-#{version.major_minor}" + (share/"wx"/version.major_minor).install share/"aclocal", share/"bakefile" end test do