diff --git a/Formula/apngasm.rb b/Formula/apngasm.rb index 58af2649602ff..b6cd43e713e40 100644 --- a/Formula/apngasm.rb +++ b/Formula/apngasm.rb @@ -4,7 +4,7 @@ class Apngasm < Formula url "https://github.com/apngasm/apngasm/archive/3.1.6.tar.gz" sha256 "0068e31cd878e07f3dffa4c6afba6242a753dac83b3799470149d2e816c1a2a7" license "Zlib" - revision 1 + revision 2 head "https://github.com/apngasm/apngasm.git" bottle do diff --git a/Formula/boost.rb b/Formula/boost.rb index b05455a54d15c..fb6a7c8de4c53 100644 --- a/Formula/boost.rb +++ b/Formula/boost.rb @@ -4,7 +4,7 @@ class Boost < Formula url "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" sha256 "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" license "BSL-1.0" - revision 2 + revision 3 head "https://github.com/boostorg/boost.git" livecheck do diff --git a/Formula/chakra.rb b/Formula/chakra.rb index e38ee059c36be..3355720694f3d 100644 --- a/Formula/chakra.rb +++ b/Formula/chakra.rb @@ -4,7 +4,7 @@ class Chakra < Formula url "https://github.com/Microsoft/ChakraCore/archive/v1.11.24.tar.gz" sha256 "b99e85f2d0fa24f2b6ccf9a6d2723f3eecfe986a9d2c4d34fa1fd0d015d0595e" license "MIT" - revision 1 + revision 2 bottle do sha256 cellar: :any, big_sur: "f57518d03ba2daf07758454a0cbe902a62f86f70a47f60b6b3b7248586ca48a8" diff --git a/Formula/couchdb.rb b/Formula/couchdb.rb index 6b0e2add92028..91272ef76748e 100644 --- a/Formula/couchdb.rb +++ b/Formula/couchdb.rb @@ -5,7 +5,7 @@ class Couchdb < Formula mirror "https://archive.apache.org/dist/couchdb/source/3.1.1/apache-couchdb-3.1.1.tar.gz" sha256 "8ffe766bba2ba39a7b49689a0732afacf69caffdf8e2d95447e82fb173c78ca3" license "Apache-2.0" - revision 1 + revision 2 bottle do sha256 cellar: :any, big_sur: "bfe011ece168ca32cb3c2813234a230238a605f53f39667bda12e89b520a0338" diff --git a/Formula/dwdiff.rb b/Formula/dwdiff.rb index 6351d873ce3bd..b8bda30f3c749 100644 --- a/Formula/dwdiff.rb +++ b/Formula/dwdiff.rb @@ -4,7 +4,7 @@ class Dwdiff < Formula url "https://os.ghalkes.nl/dist/dwdiff-2.1.4.tar.bz2" sha256 "df16fec44dcb467d65a4246a43628f93741996c1773e930b90c6dde22dd58e0a" license "GPL-3.0-only" - revision 1 + revision 2 livecheck do url "https://os.ghalkes.nl/dist/" diff --git a/Formula/freeling.rb b/Formula/freeling.rb index 7c313bce90b80..ed994e58079eb 100644 --- a/Formula/freeling.rb +++ b/Formula/freeling.rb @@ -4,7 +4,7 @@ class Freeling < Formula url "https://github.com/TALP-UPC/FreeLing/releases/download/4.2/FreeLing-src-4.2.tar.gz" sha256 "f96afbdb000d7375426644fb2f25baff9a63136dddce6551ea0fd20059bfce3b" license "AGPL-3.0-only" - revision 3 + revision 4 bottle do sha256 arm64_big_sur: "c0857913542156ed8eb7ea65fcd8bb5b07f0ca37c6d188e0eded904a6cc42d87" diff --git a/Formula/gjs.rb b/Formula/gjs.rb index 99de34351a240..9e9447578a270 100644 --- a/Formula/gjs.rb +++ b/Formula/gjs.rb @@ -4,6 +4,7 @@ class Gjs < Formula url "https://download.gnome.org/sources/gjs/1.68/gjs-1.68.0.tar.xz" sha256 "f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef" license all_of: ["LGPL-2.0-or-later", "MIT"] + revision 1 bottle do sha256 big_sur: "1e8638f3021ec9ca2f6ea9de615e7f148ee473c2e81238f7dd9769f7a3f48c14" diff --git a/Formula/harfbuzz.rb b/Formula/harfbuzz.rb index b37337d8ec0e1..e5fc5d4d0d0ed 100644 --- a/Formula/harfbuzz.rb +++ b/Formula/harfbuzz.rb @@ -4,6 +4,7 @@ class Harfbuzz < Formula url "https://github.com/harfbuzz/harfbuzz/archive/2.8.0.tar.gz" sha256 "9444358d1d8c1884c3a25b02fe702bd244172c4fdd2e98f5a165bc0987ef34f6" license "MIT" + revision 1 head "https://github.com/harfbuzz/harfbuzz.git" bottle do diff --git a/Formula/hfstospell.rb b/Formula/hfstospell.rb index 32adb6f98e94c..74cf3076e4fd5 100644 --- a/Formula/hfstospell.rb +++ b/Formula/hfstospell.rb @@ -4,7 +4,7 @@ class Hfstospell < Formula url "https://github.com/hfst/hfst-ospell/releases/download/v0.5.2/hfst-ospell-0.5.2.tar.bz2" sha256 "ab9ccf3c2165c0efd8dd514e0bf9116e86a8a079d712c0ed6c2fabf0052e9aa4" license "Apache-2.0" - revision 1 + revision 2 livecheck do url :stable diff --git a/Formula/icu4c.rb b/Formula/icu4c.rb index 95650307589d5..458e4cf9b5b46 100644 --- a/Formula/icu4c.rb +++ b/Formula/icu4c.rb @@ -1,9 +1,9 @@ class Icu4c < Formula desc "C/C++ and Java libraries for Unicode and globalization" homepage "http://site.icu-project.org/home" - url "https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz" - version "68.2" - sha256 "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625" + url "https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz" + version "69.1" + sha256 "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745" license "ICU" livecheck do diff --git a/Formula/libcdr.rb b/Formula/libcdr.rb index 4bff1365ca1a1..2dd505479fda4 100644 --- a/Formula/libcdr.rb +++ b/Formula/libcdr.rb @@ -4,6 +4,7 @@ class Libcdr < Formula url "https://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.7.tar.xz" sha256 "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4" license "MPL-2.0" + revision 1 livecheck do url "https://dev-www.libreoffice.org/src/" diff --git a/Formula/libical.rb b/Formula/libical.rb index e7b09dce7bcb4..e81e0f2c024ff 100644 --- a/Formula/libical.rb +++ b/Formula/libical.rb @@ -4,6 +4,7 @@ class Libical < Formula url "https://github.com/libical/libical/releases/download/v3.0.10/libical-3.0.10.tar.gz" sha256 "f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4" license any_of: ["LGPL-2.1-or-later", "MPL-2.0"] + revision 1 bottle do sha256 arm64_big_sur: "78820f4354ff775e64e9c513b55f5e5a40db58705642bcf59a1e55ae822a83ef" diff --git a/Formula/liblcf.rb b/Formula/liblcf.rb index 02d81b1f93c4c..83235460e82de 100644 --- a/Formula/liblcf.rb +++ b/Formula/liblcf.rb @@ -4,7 +4,7 @@ class Liblcf < Formula url "https://easyrpg.org/downloads/player/0.6.2/liblcf-0.6.2.tar.xz" sha256 "c48b4f29ee0c115339a6886fc435b54f17799c97ae134432201e994b1d3e0d34" license "MIT" - revision 2 + revision 3 head "https://github.com/EasyRPG/liblcf.git" bottle do diff --git a/Formula/libmspub.rb b/Formula/libmspub.rb index 6282e5f9dae3e..2d4ab0348cd52 100644 --- a/Formula/libmspub.rb +++ b/Formula/libmspub.rb @@ -4,7 +4,7 @@ class Libmspub < Formula url "https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.4.tar.xz" sha256 "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba" license "MPL-2.0" - revision 9 + revision 10 livecheck do url "https://dev-www.libreoffice.org/src/" diff --git a/Formula/libphonenumber.rb b/Formula/libphonenumber.rb index 9d2ef385b1fed..a3538e8f4e7c0 100644 --- a/Formula/libphonenumber.rb +++ b/Formula/libphonenumber.rb @@ -4,6 +4,7 @@ class Libphonenumber < Formula url "https://github.com/google/libphonenumber/archive/v8.12.21.tar.gz" sha256 "28849e2efc437ddb0c6e0d3a5a049964eaa0fef860c514762cf600f864864587" license "Apache-2.0" + revision 1 livecheck do url :stable diff --git a/Formula/libpsl.rb b/Formula/libpsl.rb index 8e3648bb4b6b9..dfcbaa930e882 100644 --- a/Formula/libpsl.rb +++ b/Formula/libpsl.rb @@ -4,7 +4,7 @@ class Libpsl < Formula url "https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz" sha256 "ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c" license "MIT" - revision 2 + revision 3 bottle do sha256 cellar: :any, arm64_big_sur: "7664e28a09fde07abd9982785b7662f71d4a7005238059cd207d03f089860c98" diff --git a/Formula/libvisio.rb b/Formula/libvisio.rb index 26d24645ecceb..7d1abba1a2a0d 100644 --- a/Formula/libvisio.rb +++ b/Formula/libvisio.rb @@ -3,7 +3,7 @@ class Libvisio < Formula homepage "https://wiki.documentfoundation.org/DLP/Libraries/libvisio" url "https://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.7.tar.xz" sha256 "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c" - revision 3 + revision 4 livecheck do url "https://dev-www.libreoffice.org/src/" diff --git a/Formula/mapnik.rb b/Formula/mapnik.rb index 49feb46132a73..3c6d5de47514d 100644 --- a/Formula/mapnik.rb +++ b/Formula/mapnik.rb @@ -4,7 +4,7 @@ class Mapnik < Formula url "https://github.com/mapnik/mapnik/releases/download/v3.1.0/mapnik-v3.1.0.tar.bz2" sha256 "43d76182d2a975212b4ad11524c74e577576c11039fdab5286b828397d8e6261" license "LGPL-2.1-or-later" - revision 1 + revision 2 head "https://github.com/mapnik/mapnik.git" livecheck do diff --git a/Formula/mpd.rb b/Formula/mpd.rb index d054f0b615e94..6d4037d80a6d8 100644 --- a/Formula/mpd.rb +++ b/Formula/mpd.rb @@ -4,7 +4,7 @@ class Mpd < Formula url "https://www.musicpd.org/download/mpd/0.22/mpd-0.22.6.tar.xz" sha256 "2be149a4895c3cb613477f8cf1193593e3d8a1d38a75ffa7d32da8c8316a4d5e" license "GPL-2.0-or-later" - revision 1 + revision 2 head "https://github.com/MusicPlayerDaemon/MPD.git" bottle do diff --git a/Formula/ncmpcpp.rb b/Formula/ncmpcpp.rb index 9d9ff0914363d..331ee3764f88b 100644 --- a/Formula/ncmpcpp.rb +++ b/Formula/ncmpcpp.rb @@ -4,7 +4,7 @@ class Ncmpcpp < Formula url "https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.9.2.tar.bz2" sha256 "faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b" license "GPL-2.0-or-later" - revision 1 + revision 2 bottle do sha256 cellar: :any, arm64_big_sur: "7223d508aab61a09ae0ce9f9f5bd4730af2acdb7b0fecb767eccc6d1ab03bb94" diff --git a/Formula/node.rb b/Formula/node.rb index 141cd6cfcd417..17655a307b514 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -4,6 +4,7 @@ class Node < Formula url "https://nodejs.org/dist/v16.0.0/node-v16.0.0.tar.xz" sha256 "47cb90111e8c3dc42dc538464789415354f0d933587fc89fff71f9bd816aaa02" license "MIT" + revision 1 head "https://github.com/nodejs/node.git" livecheck do diff --git a/Formula/node@10.rb b/Formula/node@10.rb index d9c5e8cb1ccfb..9f096300c8470 100644 --- a/Formula/node@10.rb +++ b/Formula/node@10.rb @@ -4,6 +4,7 @@ class NodeAT10 < Formula url "https://nodejs.org/dist/v10.24.1/node-v10.24.1.tar.xz" sha256 "d72fc2c244603b4668da94081dc4d6067d467fdfa026e06a274012f16600480c" license "MIT" + revision 1 livecheck do url "https://nodejs.org/dist/" diff --git a/Formula/node@12.rb b/Formula/node@12.rb index 05f68ee17cc7b..ec3674ae90d3c 100644 --- a/Formula/node@12.rb +++ b/Formula/node@12.rb @@ -4,6 +4,7 @@ class NodeAT12 < Formula url "https://nodejs.org/dist/v12.22.1/node-v12.22.1.tar.gz" sha256 "6023f1f8f03f9780c75e6eca9d372b8411a83757c0389c51baee1c7242afd702" license "MIT" + revision 1 livecheck do url "https://nodejs.org/dist/" @@ -23,6 +24,13 @@ class NodeAT12 < Formula depends_on "python@3.9" => :build depends_on "icu4c" + # Patch for compatibility with ICU 69. Backported from + # https://github.com/v8/v8/commit/035c305ce7761f51328b45f1bd83e26aef267c9d + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/9eb96c36ff61c76c809c975f3b4463e826eae73c/node%4012/node%4012-icu69.patch" + sha256 "c23163cc26c784479471f904fb47f1c16ec4177c687fd9c3988a8208a3faa583" + end + def install # make sure subprocesses spawned by make are using our Python 3 ENV["PYTHON"] = Formula["python@3.9"].opt_bin/"python3" diff --git a/Formula/node@14.rb b/Formula/node@14.rb index 719e60fe41ed5..dcc8a82fff864 100644 --- a/Formula/node@14.rb +++ b/Formula/node@14.rb @@ -4,6 +4,7 @@ class NodeAT14 < Formula url "https://nodejs.org/dist/v14.16.1/node-v14.16.1.tar.gz" sha256 "5f5080427abddde7f22fd2ba77cd2b8a1f86253277a1eec54bc98a202728ce80" license "MIT" + revision 1 livecheck do url "https://nodejs.org/dist/" @@ -23,6 +24,14 @@ class NodeAT14 < Formula depends_on "python@3.9" => :build depends_on "icu4c" + # Patch for compatibility with ICU 69 + # https://github.com/v8/v8/commit/035c305ce7761f51328b45f1bd83e26aef267c9d + patch do + url "https://github.com/v8/v8/commit/035c305ce7761f51328b45f1bd83e26aef267c9d.patch?full_index=1" + sha256 "dfe0f6c312b0bea2733252db41fedae330afa21b055ee886b0b8f9ca780e2901" + directory "deps/v8" + end + def install # make sure subprocesses spawned by make are using our Python 3 ENV["PYTHON"] = Formula["python@3.9"].opt_bin/"python3" diff --git a/Formula/openrct2.rb b/Formula/openrct2.rb index dfe4e00f4cf2e..cc50d916504fe 100644 --- a/Formula/openrct2.rb +++ b/Formula/openrct2.rb @@ -5,6 +5,7 @@ class Openrct2 < Formula tag: "v0.3.3", revision: "3f65f282d7332c284dcb5daaf4c278b7e9da9b92" license "GPL-3.0-only" + revision 1 head "https://github.com/OpenRCT2/OpenRCT2.git", branch: "develop" bottle do diff --git a/Formula/pazpar2.rb b/Formula/pazpar2.rb index 429e0f4879ce7..237beebc63f94 100644 --- a/Formula/pazpar2.rb +++ b/Formula/pazpar2.rb @@ -4,7 +4,7 @@ class Pazpar2 < Formula url "http://ftp.indexdata.dk/pub/pazpar2/pazpar2-1.14.0.tar.gz" sha256 "3b0012450c66d6932009ac0decb72436690cc939af33e2ad96c0fec85863d13d" license "GPL-2.0" - revision 3 + revision 4 livecheck do url "http://ftp.indexdata.dk/pub/pazpar2/" diff --git a/Formula/php.rb b/Formula/php.rb index 28f3c3a3e0eb6..73b65c84f6570 100644 --- a/Formula/php.rb +++ b/Formula/php.rb @@ -6,6 +6,7 @@ class Php < Formula mirror "https://fossies.org/linux/www/php-8.0.3.tar.xz" sha256 "c9816aa9745a9695672951eaff3a35ca5eddcb9cacf87a4f04b9fb1169010251" license "PHP-3.01" + revision 1 livecheck do url "https://www.php.net/releases/feed.php" diff --git a/Formula/php@7.2.rb b/Formula/php@7.2.rb index 338d11c64745f..d5c12eb535d9f 100644 --- a/Formula/php@7.2.rb +++ b/Formula/php@7.2.rb @@ -6,7 +6,7 @@ class PhpAT72 < Formula mirror "https://fossies.org/linux/www/php-7.2.34.tar.xz" sha256 "409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903" license "PHP-3.01" - revision 2 + revision 3 bottle do rebuild 1 diff --git a/Formula/php@7.3.rb b/Formula/php@7.3.rb index 6af65a60c7eab..123df0b678d13 100644 --- a/Formula/php@7.3.rb +++ b/Formula/php@7.3.rb @@ -6,7 +6,7 @@ class PhpAT73 < Formula mirror "https://fossies.org/linux/www/php-7.3.27.tar.xz" sha256 "65f616e2d5b6faacedf62830fa047951b0136d5da34ae59e6744cbaf5dca148d" license "PHP-3.01" - revision 1 + revision 2 bottle do sha256 big_sur: "c8e738ccfa2335cdf50e29d87edb2741e48919c2b501201d87e3452b4e14592c" diff --git a/Formula/php@7.4.rb b/Formula/php@7.4.rb index 7363d53c45447..57b3d038c139e 100644 --- a/Formula/php@7.4.rb +++ b/Formula/php@7.4.rb @@ -6,6 +6,7 @@ class PhpAT74 < Formula mirror "https://fossies.org/linux/www/php-7.4.16.tar.xz" sha256 "1c16cefaf88ded4c92eed6a8a41eb682bb2ef42429deb55f1c4ba159053fb98b" license "PHP-3.01" + revision 1 bottle do sha256 arm64_big_sur: "3d8f32719809271463e0fa2a6df17cf0f7366fad12a872a9f85e74e29a71470d" diff --git a/Formula/postgresql.rb b/Formula/postgresql.rb index d0c7c79755d51..e4372d0ae2893 100644 --- a/Formula/postgresql.rb +++ b/Formula/postgresql.rb @@ -4,7 +4,7 @@ class Postgresql < Formula url "https://ftp.postgresql.org/pub/source/v13.2/postgresql-13.2.tar.bz2" sha256 "5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc" license "PostgreSQL" - revision 1 + revision 2 head "https://github.com/postgres/postgres.git" livecheck do diff --git a/Formula/postgresql@10.rb b/Formula/postgresql@10.rb index d4ba9540067aa..27b36d3f1a142 100644 --- a/Formula/postgresql@10.rb +++ b/Formula/postgresql@10.rb @@ -4,7 +4,7 @@ class PostgresqlAT10 < Formula url "https://ftp.postgresql.org/pub/source/v10.16/postgresql-10.16.tar.bz2" sha256 "a35c718b1b6690e01c69626d467edb933784f8d1d6741e21fe6cce0738467bb3" license "PostgreSQL" - revision 1 + revision 2 livecheck do url "https://ftp.postgresql.org/pub/source/" diff --git a/Formula/postgresql@11.rb b/Formula/postgresql@11.rb index c874130034a3d..5ff8dd20b436f 100644 --- a/Formula/postgresql@11.rb +++ b/Formula/postgresql@11.rb @@ -4,7 +4,7 @@ class PostgresqlAT11 < Formula url "https://ftp.postgresql.org/pub/source/v11.11/postgresql-11.11.tar.bz2" sha256 "40607b7fa15b7d63f5075a7277daf7b3412486aa5db3aedffdb7768b9298186c" license "PostgreSQL" - revision 1 + revision 2 livecheck do url "https://ftp.postgresql.org/pub/source/" diff --git a/Formula/postgresql@12.rb b/Formula/postgresql@12.rb index bd2cab3f3a542..027ed6f6736e2 100644 --- a/Formula/postgresql@12.rb +++ b/Formula/postgresql@12.rb @@ -4,7 +4,7 @@ class PostgresqlAT12 < Formula url "https://ftp.postgresql.org/pub/source/v12.6/postgresql-12.6.tar.bz2" sha256 "df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09" license "PostgreSQL" - revision 1 + revision 2 livecheck do url "https://ftp.postgresql.org/pub/source/" diff --git a/Formula/qt.rb b/Formula/qt.rb index 96d43024ec291..9b40a7b05f16d 100644 --- a/Formula/qt.rb +++ b/Formula/qt.rb @@ -4,6 +4,7 @@ class Qt < Formula url "https://download.qt.io/official_releases/qt/6.0/6.0.3/single/qt-everywhere-src-6.0.3.tar.xz" sha256 "ca4a97439443dd0b476a47b284ba772c3b1b041a9eef733e26a789490993a0e3" license all_of: ["GFDL-1.3-only", "GPL-2.0-only", "GPL-3.0-only", "LGPL-2.1-only", "LGPL-3.0-only"] + revision 1 head "https://code.qt.io/qt/qt5.git", branch: "dev", shallow: false # The first-party website doesn't make version information readily available, @@ -83,6 +84,10 @@ def install -libproxy -no-feature-relocatable -system-sqlite + + -no-sql-mysql + -no-sql-odbc + -no-sql-psql ] # TODO: remove `-DFEATURE_qt3d_system_assimp=ON` diff --git a/Formula/sile.rb b/Formula/sile.rb index 0b2ae939efa41..2ac5bb6f283e2 100644 --- a/Formula/sile.rb +++ b/Formula/sile.rb @@ -4,7 +4,7 @@ class Sile < Formula url "https://github.com/sile-typesetter/sile/releases/download/v0.10.15/sile-0.10.15.tar.xz" sha256 "49b55730effd473c64a8955a903e48f61c51dd7bb862e6d5481193218d1e3c5c" license "MIT" - revision 1 + revision 2 bottle do sha256 cellar: :any, arm64_big_sur: "f768811fa4abe78d42b5ee0649e5cb341c1360d4d846cbf2c86034d58f680da9" @@ -23,7 +23,6 @@ class Sile < Formula depends_on "luarocks" => :build depends_on "pkg-config" => :build - depends_on "expat" depends_on "fontconfig" depends_on "harfbuzz" depends_on "icu4c" @@ -31,96 +30,102 @@ class Sile < Formula depends_on "lua" depends_on "openssl@1.1" + uses_from_macos "expat" uses_from_macos "zlib" - resource "bit32" do - url "https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz" - sha256 "d1ed32f091856f6fffab06232da79c48b437afd4cd89e5c1fc85d7905b011430" - end - - resource "cassowary" do - url "https://github.com/sile-typesetter/cassowary.lua/archive/v2.2.tar.gz" - sha256 "e2f7774b6883581491b8f2c9d1655b2136bc24d837a9e43f515590a766ec4afd" + resource "stdlib" do + url "https://luarocks.org/manifests/gvvaughan/stdlib-41.2.2-1.src.rock" + sha256 "67eadaccbb2b6037ea70129f9616da49eaeeaf1477652a8e2cc77740286531cf" end - resource "cosmo" do - url "https://github.com/mascarenhas/cosmo/archive/v16.06.04.tar.gz" - sha256 "86d17aea5080a90671d965cffeb9b104c19e0e1ea55c08687c0924c4512b52b1" + resource "bit32" do + url "https://luarocks.org/manifests/siffiejoe/bit32-5.3.5.1-1.src.rock" + sha256 "0e273427f2b877270f9cec5642ebe2670242926ba9638d4e6df7e4e1263ca12c" end resource "linenoise" do - url "https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz" - sha256 "cc1cdb4047edd056a10dcdeec853dbaf5088e2202941d579e4592584d733f09c" + url "https://luarocks.org/manifests/hoelzro/linenoise-0.9-1.rockspec" + sha256 "e4f942e0079092993832cf6e78a1f019dad5d8d659b9506692d718d0c0432c72" end resource "lpeg" do - url "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz" - sha256 "48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe" + url "https://luarocks.org/manifests/gvvaughan/lpeg-1.0.2-1.src.rock" + sha256 "e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc" + end + + # Depends on lpeg + resource "cosmo" do + url "https://luarocks.org/manifests/mascarenhas/cosmo-16.06.04-1.src.rock" + sha256 "9c83d50c8b734c0d405f97df9940ddb27578214033fd0e3cfc3e7420c999b9a9" end resource "lua_cliargs" do - url "https://github.com/amireh/lua_cliargs/archive/v3.0-2.tar.gz" - sha256 "971d6f1440a55bdf9db581d4b2bcbf472a301d76f696a0d0ed9423957c7d176e" + url "https://luarocks.org/manifests/amireh/lua_cliargs-3.0-2.src.rock" + sha256 "3c79981292aab72dbfba9eb5c006bb37c5f42ee73d7062b15fdd840c00b70d63" end resource "lua-zlib" do - url "https://github.com/brimworks/lua-zlib/archive/v1.2.tar.gz" - sha256 "26b813ad39c94fc930b168c3418e2e746af3b2e80b92f94f306f6f954cc31e7d" + url "https://luarocks.org/manifests/brimworks/lua-zlib-1.2-1.rockspec" + sha256 "3c61e946b5a1fb150839cd155ad6528143cdf9ce385eb5f580566fb2d25b37a3" end resource "luaexpat" do - url "https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz" - sha256 "a17a0e6ffa6977406b072d67a13ca0e125fad63e1229cec4efcd8d83f1c3eed9" + url "https://luarocks.org/manifests/tomasguisasola/luaexpat-1.3.3-1.src.rock" + sha256 "b55908fcd7df490a59aab25284460add8283f1c6b94ab584900fe3e49775172a" end resource "luaepnf" do - url "https://github.com/siffiejoe/lua-luaepnf/archive/v0.3.tar.gz" - sha256 "57c0ad1917e45c5677bfed0f6122da2baff98117aba05a5e987a0238600f85f9" + url "https://luarocks.org/manifests/siffiejoe/luaepnf-0.3-2.src.rock" + sha256 "7abbe5888abfa183878751e4010239d799e0dfca6139b717f375c26292876f07" end resource "luafilesystem" do - url "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.tar.gz" - sha256 "16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495" + url "https://luarocks.org/manifests/hisham/luafilesystem-1.8.0-1.src.rock" + sha256 "576270a55752894254c2cba0d49d73595d37ec4ea8a75e557fdae7aff80e19cf" end resource "luarepl" do - url "https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz" - sha256 "3c88a3b102a4a4897c46fadb2cd12ee6760438e41e39ffc6cf353582d651b313" + url "https://luarocks.org/manifests/hoelzro/luarepl-0.9-1.rockspec" + sha256 "1fc5b25e5dfffe1407537b58f7f118379ed3e86e86c09c0b9e4893ddada20990" end resource "luasocket" do - url "https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz" - sha256 "8b67d9b5b545e1b694753dab7bd6cdbc24c290f2b21ba1e14c77b32817ea1249" - end - - resource "luasec" do - url "https://github.com/brunoos/luasec/archive/v1.0.tar.gz" - sha256 "912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932" + url "https://luarocks.org/manifests/luasocket/luasocket-3.0rc1-2.src.rock" + sha256 "3882f2a1e1c6145ceb43ead385b861b97fa2f8d487e8669ec5b747406ab251c7" + version "3.0rc1-2" end resource "penlight" do - url "https://github.com/Tieske/Penlight/archive/1.9.2.tar.gz" - sha256 "1094368bd95f84428ce1ce814028f8a73ee6a952e18dfffc5fa05d9ee1f0e486" + url "https://luarocks.org/manifests/tieske/penlight-1.9.2-1.src.rock" + sha256 "49e7778ba84a5a8ac67fc2a30357f0975fe11241d7cc86df05a5abb18071d5fb" end - resource "stdlib" do - url "https://github.com/lua-stdlib/lua-stdlib/archive/release-v41.2.2.tar.gz" - sha256 "42ca25ddcde59f608694a3335d24919a4df4cf6f14ea46c75249561a16c84711" + # Depends on luafilesystem and penlight + resource "cassowary" do + url "https://luarocks.org/manifests/simoncozens/cassowary-2.2-1.src.rock" + sha256 "feab102d06f57998915a5945e6742246b5955bb65a69d45c2e572d59e6874f51" end resource "luautf8" do - url "https://github.com/starwing/luautf8/archive/0.1.3.tar.gz" - sha256 "208b3423a03a6c2822a2fa6b7cc8092ed7d3c0d792ec12c7cd28d6afaa442e0b" + url "https://luarocks.org/manifests/xavier-wang/luautf8-0.1.3-1.src.rock" + sha256 "88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa" end resource "vstruct" do - url "https://github.com/ToxicFrog/vstruct/archive/v2.1.1.tar.gz" - sha256 "029ae887fc3c59279f378a499741811976d90f9a806569a42f4de80ad349f333" + url "https://luarocks.org/manifests/deepakjois/vstruct-2.1.1-1.src.rock" + sha256 "fcfa781a72b9372c37ee20a5863f98e07112a88efea08c8b15631e911bc2b441" + end + + # Install luasec last, as this breaks installing other resources for now + # https://github.com/luarocks/luarocks/issues/1302 + # When this is resolved, move back between `luarepl` and `luasocket` + resource "luasec" do + url "https://luarocks.org/manifests/brunoos/luasec-1.0-1.src.rock" + sha256 "b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138" end def install lua = Formula["lua"] - luaprefix = lua.opt_prefix luaversion = lua.version.major_minor luapath = libexec/"vendor" @@ -136,53 +141,28 @@ def install ENV.prepend "CPPFLAGS", "-I#{lua.opt_include}/lua" ENV.prepend "LDFLAGS", "-L#{lua.opt_lib}" + zlib_dir = expat_dir = "#{MacOS.sdk_path_if_needed}/usr" + on_linux do + zlib_dir = Formula["zlib"].opt_prefix + expat_dir = Formula["expat"].opt_prefix + end + + args = %W[ + ZLIB_DIR=#{zlib_dir} + EXPAT_DIR=#{expat_dir} + OPENSSL_DIR=#{Formula["openssl@1.1"].opt_prefix} + --tree=#{luapath} + --lua-dir=#{lua.opt_prefix} + ] + resources.each do |r| r.stage do - case r.name - when "lua-zlib" - # https://github.com/brimworks/lua-zlib/commit/08d6251700965 - # https://github.com/brimworks/lua-zlib/issues/49 - mv "lua-zlib-1.1-0.rockspec", "lua-zlib-1.2-1.rockspec" - - # rockspec needs to be updated to accommodate lua5.4: - # https://github.com/brimworks/lua-zlib/pull/50 - # Note that the maintainer prefers the upper bound of `<= 5.4`, - # so this may lead to subtle breakage if lua5.5 is ever released. - # https://github.com/brimworks/lua-zlib/pull/51 - # Remove this when `lua-zlib` is updated. - inreplace "lua-zlib-1.2-1.rockspec" do |s| - s.gsub! "1.2-0", "1.2-1" - s.gsub! ", <= 5.3", "" - end - - zlib_dir = Formula["zlib"].opt_prefix - on_macos do - zlib_dir = "#{MacOS.sdk_path_if_needed}/usr" - end - - system "luarocks", "make", - "#{r.name}-#{r.version}-1.rockspec", - "ZLIB_DIR=#{zlib_dir}", - "--tree=#{luapath}", - "--lua-dir=#{luaprefix}" - when "luaexpat" - system "luarocks", "build", - r.name, - "EXPAT_DIR=#{Formula["expat"].opt_prefix}", - "--tree=#{luapath}", - "--lua-dir=#{luaprefix}" - when "luasec" - system "luarocks", "build", - r.name, - "OPENSSL_DIR=#{Formula["openssl@1.1"].opt_prefix}", - "--tree=#{luapath}", - "--lua-dir=#{luaprefix}" - else - system "luarocks", "build", - r.name, - "--tree=#{luapath}", - "--lua-dir=#{luaprefix}" - end + rock = Pathname.pwd.children(false).first + unpack_dir = Utils.safe_popen_read("luarocks", "unpack", rock).split("\n")[-2] + + spec = "#{r.name}-#{r.version}.rockspec" + spec = "cassowary-scm-0.rockspec" if r.name == "cassowary" + cd(unpack_dir) { system "luarocks", "make", *args, spec } end end @@ -196,13 +176,13 @@ def install system "make" system "make", "install" + env = { + LUA_PATH: "#{ENV["LUA_PATH"]};;", + LUA_CPATH: "#{ENV["LUA_CPATH"]};;", + } + (libexec/"bin").install bin/"sile" - (bin/"sile").write <<~EOS - #!/usr/bin/env sh - export LUA_PATH="#{ENV["LUA_PATH"]};;" - export LUA_CPATH="#{ENV["LUA_CPATH"]};;" - exec "#{libexec}/bin/sile" "$@" - EOS + (bin/"sile").write_env_script libexec/"bin/sile", env end test do diff --git a/Formula/tarantool.rb b/Formula/tarantool.rb index cf88b77ff1d37..b55dc12684ecb 100644 --- a/Formula/tarantool.rb +++ b/Formula/tarantool.rb @@ -4,6 +4,7 @@ class Tarantool < Formula url "https://download.tarantool.org/tarantool/2.7/src/tarantool-2.7.2.0.tar.gz" sha256 "9dfbd67d7c46404507a13dfeac4169b53aaa4e4237a6b84e4bbe9435a4a30080" license "BSD-2-Clause" + revision 1 version_scheme 1 head "https://github.com/tarantool/tarantool.git", shallow: false diff --git a/Formula/tectonic.rb b/Formula/tectonic.rb index f758e1cce76c2..e1687c2872a63 100644 --- a/Formula/tectonic.rb +++ b/Formula/tectonic.rb @@ -4,7 +4,7 @@ class Tectonic < Formula url "https://github.com/tectonic-typesetting/tectonic/archive/tectonic@0.4.1.tar.gz" sha256 "5a2c910f822d59ddaf9d32a0e5f7f34ce30f44e4129513b3a0c50425cf48ac8f" license "MIT" - revision 1 + revision 2 # As of writing, only the tags starting with `tectonic@` are release versions. # NOTE: The `GithubLatest` strategy cannot be used here because the "latest" diff --git a/Formula/tepl.rb b/Formula/tepl.rb index 6d6f9c6c6fbcb..f734425bc6a63 100644 --- a/Formula/tepl.rb +++ b/Formula/tepl.rb @@ -4,7 +4,7 @@ class Tepl < Formula url "https://download.gnome.org/sources/tepl/5.0/tepl-5.0.1.tar.xz" sha256 "b1274967609f524484b38775fa9ecb296c6d6616aabd052f286339a289912804" license "LGPL-2.1-or-later" - revision 1 + revision 2 bottle do sha256 arm64_big_sur: "212e5b56aa0fea2649092804f23313f04483e9152eb8e34bb1b178ff3aceb6e1" diff --git a/Formula/urweb.rb b/Formula/urweb.rb index 8da7912bce674..84f111f8267d1 100644 --- a/Formula/urweb.rb +++ b/Formula/urweb.rb @@ -3,7 +3,7 @@ class Urweb < Formula homepage "http://www.impredicative.com/ur/" url "https://github.com/urweb/urweb/releases/download/20200209/urweb-20200209.tar.gz" sha256 "ac3010c57f8d90f09f49dfcd6b2dc4d5da1cdbb41cbf12cb386e96e93ae30662" - revision 3 + revision 4 bottle do sha256 big_sur: "6fd6c24befec836a6bdeb0880f909113379d901a7774b87daca85c9f66c32fa6" diff --git a/Formula/vte3.rb b/Formula/vte3.rb index 346d8cf799a32..8b7c1785f3a0f 100644 --- a/Formula/vte3.rb +++ b/Formula/vte3.rb @@ -4,6 +4,7 @@ class Vte3 < Formula url "https://download.gnome.org/sources/vte/0.64/vte-0.64.0.tar.xz" sha256 "c0c60b8dc343167437c86d984b0cf134df86034180ed70513f683006ada3ec41" license "LGPL-2.0-or-later" + revision 1 bottle do sha256 arm64_big_sur: "a116d2ac9dafdf1c5e6ef6f78613d2d3a51cfe8723c71b893a844c4dbcfa42cb" diff --git a/Formula/vtk.rb b/Formula/vtk.rb index 4a9f06619fa8a..3c0860c199559 100644 --- a/Formula/vtk.rb +++ b/Formula/vtk.rb @@ -4,7 +4,7 @@ class Vtk < Formula url "https://www.vtk.org/files/release/9.0/VTK-9.0.1.tar.gz" sha256 "1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7" license "BSD-3-Clause" - revision 8 + revision 9 head "https://github.com/Kitware/VTK.git" bottle do diff --git a/Formula/widelands.rb b/Formula/widelands.rb index a5364f97bd1e1..13a358731708a 100644 --- a/Formula/widelands.rb +++ b/Formula/widelands.rb @@ -4,7 +4,7 @@ class Widelands < Formula url "https://launchpad.net/widelands/build21/build21/+download/widelands-build21-source.tar.gz" version "21" sha256 "601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357" - revision 5 + revision 6 livecheck do url :stable diff --git a/Formula/yaz.rb b/Formula/yaz.rb index 211cc2c6046e2..1a186d5d5434e 100644 --- a/Formula/yaz.rb +++ b/Formula/yaz.rb @@ -4,7 +4,7 @@ class Yaz < Formula url "http://ftp.indexdata.dk/pub/yaz/yaz-5.30.3.tar.gz" sha256 "f0497fd8420574efab4e5738ea3b70787a6e8042f585156baa30bdc1911ba552" license "BSD-3-Clause" - revision 1 + revision 2 livecheck do url "http://ftp.indexdata.dk/pub/yaz/" diff --git a/Formula/zebra.rb b/Formula/zebra.rb index 85a23a024f98c..8be819ca4e049 100644 --- a/Formula/zebra.rb +++ b/Formula/zebra.rb @@ -4,7 +4,7 @@ class Zebra < Formula url "http://ftp.indexdata.dk/pub/zebra/idzebra-2.2.2.tar.gz" sha256 "513c2bf272e12745d4a7b58599ded0bc1292a84e9dc420a32eb53b6601ae0000" license "GPL-2.0-or-later" - revision 1 + revision 2 livecheck do url :homepage diff --git a/Formula/znc.rb b/Formula/znc.rb index 7c78a4663e9d2..399809aea301a 100644 --- a/Formula/znc.rb +++ b/Formula/znc.rb @@ -4,7 +4,7 @@ class Znc < Formula url "https://znc.in/releases/archive/znc-1.8.2.tar.gz" sha256 "ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d" license "Apache-2.0" - revision 2 + revision 3 bottle do sha256 arm64_big_sur: "18345054b7781bf24544da8e0518b47b690b758072b779d92e08c5293a6ef49a" diff --git a/Formula/zorba.rb b/Formula/zorba.rb index 8f2b608ad506a..082bc96ef7b29 100644 --- a/Formula/zorba.rb +++ b/Formula/zorba.rb @@ -4,7 +4,7 @@ class Zorba < Formula url "https://github.com/28msec/zorba/archive/3.1.tar.gz" sha256 "05eed935c0ff3626934a5a70724a42410fd93bc96aba1fa4821736210c7f1dd8" license "Apache-2.0" - revision 13 + revision 14 bottle do sha256 arm64_big_sur: "405903292b2d77ddbeae81e4ff1fbd3607b13d63151e3323b6e27d6e846933c0"