From 36b87a1cf69f90daa65c5888e893d04f8808dc6a Mon Sep 17 00:00:00 2001 From: commitay Date: Sat, 20 Oct 2018 18:37:45 +1000 Subject: [PATCH] tcl-tk: remove devel spec --- Formula/tcl-tk.rb | 54 ++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/Formula/tcl-tk.rb b/Formula/tcl-tk.rb index 3c918dcf97..a02ff84c77 100644 --- a/Formula/tcl-tk.rb +++ b/Formula/tcl-tk.rb @@ -1,29 +1,10 @@ class TclTk < Formula desc "Tool Command Language" homepage "https://www.tcl.tk/" - - stable do - url "https://downloads.sourceforge.net/project/tcl/Tcl/8.6.8/tcl8.6.8-src.tar.gz" - mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/tcl/tcl8.6.8-src.tar.gz" - version "8.6.8" - sha256 "c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a" - - resource "tk" do - url "https://downloads.sourceforge.net/project/tcl/Tcl/8.6.8/tk8.6.8-src.tar.gz" - mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/tk/tk8.6.8-src.tar.gz" - version "8.6.8" - sha256 "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" - - # Upstream issue 7 Jan 2018 "Build failure with Aqua support on OS X 10.8 and 10.9" - # See https://core.tcl.tk/tcl/tktview/95a8293a2936e34cc8d0658c21e5214f1ca9b435 - if MacOS.version == :mavericks || MacOS.version == :mountain_lion - patch :p0 do - url "https://raw.githubusercontent.com/macports/macports-ports/0a883ad388b/x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff" - sha256 "2cdba6bbf2503307fe4f4d7200ad57c9926ebf0ff6ed3e65bf551067a30a04a9" - end - end - end - end + url "https://downloads.sourceforge.net/project/tcl/Tcl/8.6.8/tcl8.6.8-src.tar.gz" + mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/tcl/tcl8.6.8-src.tar.gz" + version "8.6.8" + sha256 "c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a" bottle do sha256 "1690ca5d3ae90ab441493ba502594ae19739e10ab22385ccd5b59127b1e082d3" => :mojave @@ -32,17 +13,6 @@ class TclTk < Formula sha256 "79222749d221013eb7d1fb529ace13293a819b43d6633b964d1f8f318ac66f33" => :el_capitan end - devel do - url "https://downloads.sourceforge.net/project/tcl/Tcl/8.7a1/tcl8.7a1-src.tar.gz" - version "8.7a1" - sha256 "2bbd4e0bbdebeaf5dc6cc823d0805afb45c764292f6667d9ce2b9fcf5399e0dc" - - resource "tk" do - url "https://downloads.sourceforge.net/project/tcl/Tcl/8.7a1/tk8.7a1-src.tar.gz" - sha256 "131e4bae43a15dff0324c0479358bb42cfd7b8de0e1ca8d93c9207643c7144dd" - end - end - keg_only :provided_by_macos, "tk installs some X11 headers and macOS provides an (older) Tcl/Tk" @@ -54,6 +24,22 @@ class TclTk < Formula sha256 "72667ecbbd41af740157ee346db77734d1245b41dffc13ac80ca678dd3ccb515" end + resource "tk" do + url "https://downloads.sourceforge.net/project/tcl/Tcl/8.6.8/tk8.6.8-src.tar.gz" + mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/tk/tk8.6.8-src.tar.gz" + version "8.6.8" + sha256 "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" + + # Upstream issue 7 Jan 2018 "Build failure with Aqua support on OS X 10.8 and 10.9" + # See https://core.tcl.tk/tcl/tktview/95a8293a2936e34cc8d0658c21e5214f1ca9b435 + if MacOS.version == :mavericks || MacOS.version == :mountain_lion + patch :p0 do + url "https://raw.githubusercontent.com/macports/macports-ports/0a883ad388b/x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff" + sha256 "2cdba6bbf2503307fe4f4d7200ad57c9926ebf0ff6ed3e65bf551067a30a04a9" + end + end + end + def install args = %W[ --prefix=#{prefix}