Homebrew · carlocab · Feb 16, 2021 · Feb 17, 2021 · Feb 17, 2021 · Feb 17, 2021
diff --git a/Formula/apngasm.rb b/Formula/apngasm.rb
@@ -4,6 +4,7 @@ class Apngasm < Formula
   url "https://github.com/apngasm/apngasm/archive/3.1.6.tar.gz"
   sha256 "0068e31cd878e07f3dffa4c6afba6242a753dac83b3799470149d2e816c1a2a7"
   license "Zlib"
+  revision 1
   head "https://github.com/apngasm/apngasm.git"
 
   bottle do

diff --git a/Formula/avro-cpp.rb b/Formula/avro-cpp.rb
@@ -5,7 +5,7 @@ class AvroCpp < Formula
   mirror "https://archive.apache.org/dist/avro/avro-1.10.1/cpp/avro-cpp-1.10.1.tar.gz"
   sha256 "6e9e8820325cdaffcc1981958ed86b484c33dcf0277a164b2a58357fdd046cc8"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "ea71e8ee1e1274fed73fc1c748a2952104ddd2bcc9b06ae01bc7ca21caa7a637"

diff --git a/Formula/azure-storage-cpp.rb b/Formula/azure-storage-cpp.rb
@@ -4,6 +4,7 @@ class AzureStorageCpp < Formula
   url "https://github.com/Azure/azure-storage-cpp/archive/v7.5.0.tar.gz"
   sha256 "446a821d115949f6511b7eb01e6a0e4f014b17bfeba0f3dc33a51750a9d5eca5"
   license "Apache-2.0"
+  revision 1
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "de1bb0a0a6971e3131e8b4a6ee49e074f5644183f39e80fe1dcea0d0c96cb93c"

diff --git a/Formula/boost.rb b/Formula/boost.rb
@@ -5,7 +5,7 @@ class Boost < Formula
   mirror "https://dl.bintray.com/homebrew/mirror/boost_1_75_0.tar.bz2"
   sha256 "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"
   license "BSL-1.0"
-  revision 1
+  revision 2
   head "https://github.com/boostorg/boost.git"
 
   livecheck do

diff --git a/Formula/chakra.rb b/Formula/chakra.rb
@@ -4,6 +4,7 @@ class Chakra < Formula
   url "https://github.com/Microsoft/ChakraCore/archive/v1.11.24.tar.gz"
   sha256 "b99e85f2d0fa24f2b6ccf9a6d2723f3eecfe986a9d2c4d34fa1fd0d015d0595e"
   license "MIT"
+  revision 1
 
   bottle do
     sha256 cellar: :any, big_sur:  "54835c87297a98ea9edb65a60d47b82f6e67b5207d1297e04bf23a41a9eea597"

diff --git a/Formula/couchdb.rb b/Formula/couchdb.rb
@@ -5,6 +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
 
   bottle do
     sha256 cellar: :any, catalina:    "8d192716d7cb1aabe1e0d556ee86717c11c9079e18699d718ffd3aa7c94d57ec"
@@ -85,7 +86,7 @@ def plist
     fork do
       exec "#{bin}/couchdb -couch_ini #{testpath}/etc/default.ini #{testpath}/etc/local.ini"
     end
-    sleep 2
+    sleep 30
 
     output = JSON.parse shell_output("curl --silent localhost:#{port}")
     assert_equal "Welcome", output["couchdb"]

diff --git a/Formula/dwdiff.rb b/Formula/dwdiff.rb
@@ -4,6 +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
 
   livecheck do
     url "https://os.ghalkes.nl/dist/"

diff --git a/Formula/field3d.rb b/Formula/field3d.rb
@@ -4,6 +4,7 @@ class Field3d < Formula
   url "https://github.com/imageworks/Field3D/archive/v1.7.3.tar.gz"
   sha256 "b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4"
   license "BSD-3-Clause"
+  revision 1
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "7e00e38654398cd4cfe284517790e5fd6cc354ecaba6264aa0ff4952ade5727e"

diff --git 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 2
+  revision 3
 
   bottle do
     sha256 arm64_big_sur: "18aeb17c8cf2d6b4700831087ce7782d149c588fa22488b9212eb76dbbe8bcfd"

diff --git a/Formula/gjs.rb b/Formula/gjs.rb
@@ -4,6 +4,7 @@ class Gjs < Formula
   url "https://download.gnome.org/sources/gjs/1.66/gjs-1.66.2.tar.xz"
   sha256 "bd7f5f8b171277cc0bb9ee1754b0240b62f06a76b8b18c968cf471b34ab34e59"
   license all_of: ["LGPL-2.0-or-later", "MIT"]
+  revision 1
 
   bottle do
     sha256 big_sur:  "ed18080951a9b2cb2d3ff96e3bf17c91f488cd7499049c244957ae659ce9ab8d"

diff --git a/Formula/harfbuzz.rb b/Formula/harfbuzz.rb
@@ -4,6 +4,7 @@ class Harfbuzz < Formula
   url "https://github.com/harfbuzz/harfbuzz/archive/2.7.4.tar.gz"
   sha256 "daff8a4003ac420a8550760ed303ce33b310c8ea17b7f15b307d1969cabcebcb"
   license "MIT"
+  revision 1
   head "https://github.com/harfbuzz/harfbuzz.git"
 
   bottle do

diff --git a/Formula/hfstospell.rb b/Formula/hfstospell.rb
@@ -4,6 +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
 
   livecheck do
     url :stable

diff --git 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-67-1/icu4c-67_1-src.tgz"
-  version "67.1"
-  sha256 "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"
+  url "https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz"
+  version "68.2"
+  sha256 "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
   license "ICU"
 
   livecheck do
@@ -24,13 +24,6 @@ class Icu4c < Formula
 
   keg_only :provided_by_macos, "macOS provides libicucore.dylib (but nothing else)"
 
-  # fix C++14 compatibility of U_ASSERT macro.
-  # Remove with next release (ICU 68).
-  patch :p2 do
-    url "https://github.com/unicode-org/icu/commit/715d254a02b0b22681cb6f861b0921ae668fa7d6.patch?full_index=1"
-    sha256 "a87e1b9626ec5803b1220489c0d6cc544a5f293f1c5280e3b27871780c4ecde8"
-  end
-
   def install
     args = %W[
       --prefix=#{prefix}

diff --git a/Formula/libcdr.rb b/Formula/libcdr.rb
@@ -3,7 +3,7 @@ class Libcdr < Formula
   homepage "https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
   url "https://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.6.tar.xz"
   sha256 "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"
-  revision 2
+  revision 3
 
   livecheck do
     url "https://dev-www.libreoffice.org/src/"
@@ -25,6 +25,13 @@ class Libcdr < Formula
   depends_on "librevenge"
   depends_on "little-cms2"
 
+  # Patch for `error: use of undeclared identifier 'TRUE'`
+  # when built against icu4c 68.1+
+  patch do
+    url "https://github.com/LibreOffice/libcdr/commit/bf3e7f3bbc414d4341cf1420c99293debf1bd894.patch?full_index=1"
+    sha256 "7009cef94c259d4e6f7c62214df4661507d89ac7b548db60ed7ab5e37c8e0dcc"
+  end
+
   def install
     ENV.cxx11
     # Needed for Boost 1.59.0 compatibility.

diff --git a/Formula/libical.rb b/Formula/libical.rb
@@ -4,7 +4,7 @@ class Libical < Formula
   url "https://github.com/libical/libical/releases/download/v3.0.9/libical-3.0.9.tar.gz"
   sha256 "bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728"
   license any_of: ["LGPL-2.1-or-later", "MPL-2.0"]
-  revision 1
+  revision 2
 
   bottle do
     sha256 arm64_big_sur: "4444c686c12f4ccb5a2b1bba379b8b3e10b0c682e74664f003eddd188666d706"

diff --git 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 1
+  revision 2
   head "https://github.com/EasyRPG/liblcf.git"
 
   bottle do

diff --git 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 8
+  revision 9
 
   livecheck do
     url "https://dev-www.libreoffice.org/src/"

diff --git a/Formula/libphonenumber.rb b/Formula/libphonenumber.rb
@@ -4,6 +4,7 @@ class Libphonenumber < Formula
   url "https://github.com/google/libphonenumber/archive/v8.12.18.tar.gz"
   sha256 "280fb7ff1a7019c825e33bb8540524873f60ac8f26dda4ad66106802034da60f"
   license "Apache-2.0"
+  revision 1
 
   livecheck do
     url :stable

diff --git 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 1
+  revision 2
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "c20b9de4b0106e4d7175b7518b09312ad2d07c23ed55db72eea66d3490a0828c"

diff --git 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 2
+  revision 3
 
   livecheck do
     url "https://dev-www.libreoffice.org/src/"

diff --git a/Formula/mapnik.rb b/Formula/mapnik.rb
@@ -4,6 +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
   head "https://github.com/mapnik/mapnik.git"
 
   livecheck do

diff --git a/Formula/mpd.rb b/Formula/mpd.rb
@@ -4,6 +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
   head "https://github.com/MusicPlayerDaemon/MPD.git"
 
   bottle do

diff --git a/Formula/ncmpcpp.rb b/Formula/ncmpcpp.rb
@@ -4,6 +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
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "3eb2acf03fdab347f1464bc47c4154322e80c4c25815547db63ae370ff564e3a"

diff --git a/Formula/node.rb b/Formula/node.rb
@@ -4,6 +4,7 @@ class Node < Formula
   url "https://nodejs.org/dist/v15.10.0/node-v15.10.0.tar.xz"
   sha256 "7748d8f15eabb5543f26fec8ca08e755044512fab1f6bd98d5ba403f276deec4"
   license "MIT"
+  revision 1
   head "https://github.com/nodejs/node.git"
 
   livecheck do

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -4,6 +4,7 @@ class NodeAT10 < Formula
   url "https://nodejs.org/dist/v10.24.0/node-v10.24.0.tar.xz"
   sha256 "158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc"
   license "MIT"
+  revision 1
 
   livecheck do
     url "https://nodejs.org/dist/"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -4,6 +4,7 @@ class NodeAT12 < Formula
   url "https://nodejs.org/dist/v12.21.0/node-v12.21.0.tar.gz"
   sha256 "36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e"
   license "MIT"
+  revision 1
 
   livecheck do
     url "https://nodejs.org/dist/"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -4,6 +4,7 @@ class NodeAT14 < Formula
   url "https://nodejs.org/dist/v14.16.0/node-v14.16.0.tar.gz"
   sha256 "f6b904b06951de4c52089dd4456155d853e835b0dc4640f75458c6eb49f9e8ce"
   license "MIT"
+  revision 1
 
   livecheck do
     url "https://nodejs.org/dist/"

diff --git a/Formula/openrct2.rb b/Formula/openrct2.rb
@@ -5,6 +5,7 @@ class Openrct2 < Formula
       tag:      "v0.3.2",
       revision: "cea5fab238e5dd17a2f958c0a484ad97035264ae"
   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
@@ -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 2
+  revision 3
 
   livecheck do
     url "http://ftp.indexdata.dk/pub/pazpar2/"

diff --git a/Formula/php.rb b/Formula/php.rb
@@ -6,6 +6,7 @@ class Php < Formula
   mirror "https://fossies.org/linux/www/php-8.0.2.tar.xz"
   sha256 "84dd6e36f48c3a71ff5dceba375c1f6b34b71d4fa9e06b720780127176468ccc"
   license "PHP-3.01"
+  revision 1
 
   livecheck do
     url "https://www.php.net/releases/feed.php"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -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 1
+  revision 2
 
   bottle do
     sha256 big_sur:  "e39495f5389c97e3e3e1c2b0ea47832cdff5e5db25e671da0f918d0fc74a7137"
@@ -16,7 +16,7 @@ class PhpAT72 < Formula
 
   keg_only :versioned_formula
 
-  deprecate! date: "2020-11-30", because: :versioned_formula
+  disable! date: "2021-11-30", because: :deprecated_upstream
 
   depends_on "httpd" => [:build, :test]
   depends_on "pkg-config" => :build
@@ -64,6 +64,10 @@ def install
     # See https://bugs.php.net/bug.php?id=80171
     ENV.append "CFLAGS", "-Wno-implicit-function-declaration"
 
+    # Workaround for https://bugs.php.net/80310
+    ENV.append "CFLAGS", "-DU_DEFINE_FALSE_AND_TRUE=1"
+    ENV.append "CXXFLAGS", "-DU_DEFINE_FALSE_AND_TRUE=1"
+
     # buildconf required due to system library linking bug patch
     system "./buildconf", "--force"
 

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -6,6 +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
 
   bottle do
     sha256 big_sur:  "f732c10eb1031729f23f28dc3c7568ae4b6565609cbedf8b37a038cd41281aea"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -6,6 +6,7 @@ class PhpAT74 < Formula
   mirror "https://fossies.org/linux/www/php-7.4.15.tar.xz"
   sha256 "9b859c65f0cf7b3eff9d4a28cfab719fb3d36a1db3c20d874a79b5ec44d43cb8"
   license "PHP-3.01"
+  revision 1
 
   bottle do
     sha256 arm64_big_sur: "3120baa405c79acaae9622e4c99599d8fe09ccdbaeecb8965d131c9559c257f1"

diff --git a/Formula/postgresql.rb b/Formula/postgresql.rb
@@ -4,6 +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
   head "https://github.com/postgres/postgres.git"
 
   livecheck do

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -4,6 +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
 
   livecheck do
     url "https://ftp.postgresql.org/pub/source/"
@@ -34,6 +35,14 @@ class PostgresqlAT10 < Formula
     depends_on "util-linux"
   end
 
+  # Patch for `error: conflicting types for 'DefineCollation'`
+  # when built against icu4c 68.2. Adapted from
+  # https://svnweb.freebsd.org/ports/head/databases/postgresql10-server/files/patch-icu68?revision=553940&view=co
+  patch do
+    url "https://raw.githubusercontent.com/Homebrew/formula-patches/a28787a7f9b4a33cf5036379236e5a57a36282bc/postgresql%4010/icu4c68-2.patch"
+    sha256 "8d625f31f176c256a9b8b5763e751091472d9f8a57e12bb7324c990777cf674c"
+  end
+
   def install
     ENV.prepend "LDFLAGS", "-L#{Formula["[email protected]"].opt_lib} -L#{Formula["readline"].opt_lib}"
     ENV.prepend "CPPFLAGS", "-I#{Formula["[email protected]"].opt_include} -I#{Formula["readline"].opt_include}"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -4,6 +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
 
   livecheck do
     url "https://ftp.postgresql.org/pub/source/"

diff --git a/Formula/[email protected] b/Formula/[email protected]
@@ -4,6 +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
 
   livecheck do
     url "https://ftp.postgresql.org/pub/source/"

diff --git a/Formula/sile.rb b/Formula/sile.rb
@@ -4,6 +4,7 @@ class Sile < Formula
   url "https://github.com/sile-typesetter/sile/releases/download/v0.10.14/sile-0.10.14.tar.xz"
   sha256 "255a1ebfd745e13a670e1a24fe34ef209b823819a19532d1a63cde6755340e80"
   license "MIT"
+  revision 1
 
   bottle do
     sha256 cellar: :any, arm64_big_sur: "7aacf1722fd5edb35edbafed39a5135ee9dbfc614d5c2af6a78a10a4e72b58ae"