Homebrew · commitay · Apr 9, 2018 · Apr 9, 2018 · Apr 9, 2018 · Apr 9, 2018
diff --git a/Aliases/boost-python@1.66 → Aliases/boost-python@1.67 b/Aliases/boost-python@1.66 → Aliases/boost-python@1.67
diff --git a/Aliases/boost@1.66 → Aliases/boost@1.67 b/Aliases/boost@1.66 → Aliases/boost@1.67
diff --git a/Formula/apache-arrow.rb b/Formula/apache-arrow.rb
@@ -3,6 +3,7 @@ class ApacheArrow < Formula
   homepage "https://arrow.apache.org/"
   url "https://www.apache.org/dyn/closer.cgi?path=arrow/arrow-0.9.0/apache-arrow-0.9.0.tar.gz"
   sha256 "beb1c684b2f7737f64407a7b19eb7a12061eec8de3b06ef6e8af95d5a30b899a"
+  revision 1
   head "https://github.com/apache/arrow.git"
 
   bottle do

diff --git a/Formula/bitcoin.rb b/Formula/bitcoin.rb
@@ -3,7 +3,7 @@ class Bitcoin < Formula
   homepage "https://bitcoin.org/"
   url "https://bitcoin.org/bin/bitcoin-core-0.16.0/bitcoin-0.16.0.tar.gz"
   sha256 "8cbec0397d932cab7297a8c23c918392f6eebd410646b4b954787de9f4a3ee40"
-  revision 1
+  revision 2
 
   bottle do
     cellar :any

diff --git a/Formula/boost-bcp.rb b/Formula/boost-bcp.rb
@@ -1,8 +1,8 @@
 class BoostBcp < Formula
   desc "Utility for extracting subsets of the Boost library"
   homepage "https://www.boost.org/doc/tools/bcp/"
-  url "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2"
-  sha256 "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
+  url "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2"
+  sha256 "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
   head "https://github.com/boostorg/boost.git"
 
   bottle do

diff --git a/Formula/boost-build.rb b/Formula/boost-build.rb
@@ -1,8 +1,8 @@
 class BoostBuild < Formula
   desc "C++ build system"
   homepage "https://www.boost.org/build/"
-  url "https://github.com/boostorg/build/archive/boost-1.66.0.tar.gz"
-  sha256 "f5ae37542edf1fba10356532d9a1e7615db370d717405557d6d01d2ff5903433"
+  url "https://github.com/boostorg/build/archive/boost-1.67.0.tar.gz"
+  sha256 "0deac13cd1c811b6336456288dcb401a59d367ea68429a97f39f2b0bd65a61f8"
   version_scheme 1
   head "https://github.com/boostorg/build.git"
 

diff --git a/Formula/boost-mpi.rb b/Formula/boost-mpi.rb
@@ -1,9 +1,8 @@
 class BoostMpi < Formula
   desc "C++ library for C++/MPI interoperability"
   homepage "https://www.boost.org/"
-  url "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2"
-  sha256 "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
-  revision 1
+  url "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2"
+  sha256 "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
   head "https://github.com/boostorg/boost.git"
 
   bottle do

diff --git a/Formula/boost-python.rb b/Formula/boost-python.rb
@@ -1,10 +1,8 @@
 class BoostPython < Formula
   desc "C++ library for C++/Python2 interoperability"
   homepage "https://www.boost.org/"
-  url "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2"
-  sha256 "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
-  revision 1
-
+  url "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2"
+  sha256 "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
   head "https://github.com/boostorg/boost.git"
 
   bottle do
@@ -62,7 +60,7 @@ def install
     pyincludes = Utils.popen_read("python-config --includes").chomp.split(" ")
     pylib = Utils.popen_read("python-config --ldflags").chomp.split(" ")
 
-    system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python", "-o",
+    system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python27", "-o",
            "hello.so", *pyincludes, *pylib
 
     output = <<~EOS

diff --git a/Formula/boost-python3.rb b/Formula/boost-python3.rb
@@ -1,9 +1,8 @@
 class BoostPython3 < Formula
   desc "C++ library for C++/Python3 interoperability"
   homepage "https://www.boost.org/"
-  url "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2"
-  sha256 "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
-  revision 1
+  url "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2"
+  sha256 "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
   head "https://github.com/boostorg/boost.git"
 
   bottle do
@@ -90,7 +89,7 @@ def install
     pyincludes = Utils.popen_read("python3-config --includes").chomp.split(" ")
     pylib = Utils.popen_read("python3-config --ldflags").chomp.split(" ")
 
-    system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python3", "-o",
+    system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python36", "-o",
            "hello.so", *pyincludes, *pylib
 
     output = <<~EOS

diff --git a/Formula/boost.rb b/Formula/boost.rb
@@ -1,8 +1,8 @@
 class Boost < Formula
   desc "Collection of portable C++ source libraries"
   homepage "https://www.boost.org/"
-  url "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2"
-  sha256 "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
+  url "https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2"
+  sha256 "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"
   head "https://github.com/boostorg/boost.git"
 
   bottle do

diff --git a/Formula/folly.rb b/Formula/folly.rb
@@ -3,6 +3,7 @@ class Folly < Formula
   homepage "https://github.com/facebook/folly"
   url "https://github.com/facebook/folly/archive/v2018.04.16.00.tar.gz"
   sha256 "f24adaf8a63fe5e872d4021f7e9110a49843296059a705348a70b80a87c63adc"
+  revision 1
   head "https://github.com/facebook/folly.git"
 
   bottle do

diff --git a/Formula/fuego.rb b/Formula/fuego.rb
@@ -7,7 +7,7 @@ class Fuego < Formula
     url "svn://svn.code.sf.net/p/fuego/code/trunk", :revision => 1981
   end
   version "1.1.SVN"
-  revision 1
+  revision 2
 
   head "https://svn.code.sf.net/p/fuego/code/trunk"
 

diff --git a/Formula/gnuradio.rb b/Formula/gnuradio.rb
@@ -3,7 +3,7 @@ class Gnuradio < Formula
   homepage "https://gnuradio.org/"
   url "https://gnuradio.org/releases/gnuradio/gnuradio-3.7.11.tar.gz"
   sha256 "87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4"
-  revision 3
+  revision 4
   head "https://github.com/gnuradio/gnuradio.git"
 
   bottle do
@@ -40,6 +40,9 @@ class Gnuradio < Formula
   depends_on "pygtk" => :optional
   depends_on "wxpython" => :optional
 
+  # Boost 1.67.0 compatibility
+  patch :DATA
+
   # cheetah starts here
   resource "Markdown" do
     url "https://files.pythonhosted.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz"
@@ -199,3 +202,53 @@ def main(top_block_cls=top_block, options=None):
     end
   end
 end
+
+__END__
+diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc
+index d12e0eb..c95bd8e 100644
+--- a/gr-blocks/lib/message_strobe_impl.cc
++++ b/gr-blocks/lib/message_strobe_impl.cc
+@@ -90,7 +90,7 @@ namespace gr {
+     void message_strobe_impl::run()
+     {
+       while(!d_finished) {
+-        boost::this_thread::sleep(boost::posix_time::milliseconds(d_period_ms));
++        boost::this_thread::sleep(boost::posix_time::milliseconds(long(d_period_ms)));
+         if(d_finished) {
+           return;
+         }
+diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc
+index c62aad1..df9d4bb 100644
+--- a/gr-blocks/lib/message_strobe_random_impl.cc
++++ b/gr-blocks/lib/message_strobe_random_impl.cc
+@@ -108,7 +108,7 @@ namespace gr {
+     void message_strobe_random_impl::run()
+     {
+       while(!d_finished) {
+-        boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay())));
++        boost::this_thread::sleep(boost::posix_time::milliseconds(long(std::max(0.0f,next_delay()))));
+         if(d_finished) {
+           return;
+         }
+diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
+index 7f3478c..41aded5 100644
+--- a/gr-uhd/lib/usrp_block_impl.cc
++++ b/gr-uhd/lib/usrp_block_impl.cc
+@@ -128,7 +128,7 @@ bool usrp_block_impl::_wait_for_locked_sensor(
+
+   while (true) {
+     if ((not first_lock_time.is_not_a_date_time()) and
+-        (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(LOCK_TIMEOUT)))) {
++        (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(long(LOCK_TIMEOUT))))) {
+       break;
+     }
+
+@@ -139,7 +139,7 @@ bool usrp_block_impl::_wait_for_locked_sensor(
+     else {
+       first_lock_time = boost::system_time(); //reset to 'not a date time'
+
+-      if (boost::get_system_time() > (start + boost::posix_time::seconds(LOCK_TIMEOUT))){
++      if (boost::get_system_time() > (start + boost::posix_time::seconds(long(LOCK_TIMEOUT)))){
+         return false;
+       }
+     }
diff --git a/Formula/ledger.rb b/Formula/ledger.rb
@@ -3,7 +3,7 @@ class Ledger < Formula
   homepage "https://ledger-cli.org/"
   url "https://github.com/ledger/ledger/archive/v3.1.1.tar.gz"
   sha256 "90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a"
-  revision 9
+  revision 10
   head "https://github.com/ledger/ledger.git"
 
   bottle do
@@ -32,6 +32,10 @@ class Ledger < Formula
   def install
     ENV.cxx11
 
+    # Boost >= 1.67 Python components require a Python version suffix
+    inreplace "CMakeLists.txt", "set(BOOST_PYTHON python)",
+                                "set(BOOST_PYTHON python27)"
+
     flavor = build.with?("debug") ? "debug" : "opt"
 
     args = %W[

diff --git a/Formula/lgogdownloader.rb b/Formula/lgogdownloader.rb
@@ -3,7 +3,7 @@ class Lgogdownloader < Formula
   homepage "https://sites.google.com/site/gogdownloader/"
   url "https://sites.google.com/site/gogdownloader/lgogdownloader-3.3.tar.gz"
   sha256 "8bb7a37b48f558bddeb662ebac32796b0ae11fa2cc57a03d48b3944198e800ce"
-  revision 2
+  revision 3
 
   bottle do
     cellar :any

diff --git a/Formula/libbitcoin.rb b/Formula/libbitcoin.rb
@@ -3,6 +3,7 @@ class Libbitcoin < Formula
   homepage "https://libbitcoin.org/"
   url "https://github.com/libbitcoin/libbitcoin/archive/v3.5.0.tar.gz"
   sha256 "214d9cd6581330b0e1f6fd8f0c634c46b75ae5515806ecac189f21c0291ae2d9"
+  revision 1
 
   bottle do
     cellar :any

diff --git a/Formula/metaproxy.rb b/Formula/metaproxy.rb
@@ -3,7 +3,7 @@ class Metaproxy < Formula
   homepage "https://www.indexdata.com/metaproxy"
   url "http://ftp.indexdata.dk/pub/metaproxy/metaproxy-1.13.0.tar.gz"
   sha256 "ed3d40058e0e36141bea7d7f0e39733a7b7409281cdf6a60be90186d412c2be1"
-  revision 1
+  revision 2
 
   bottle do
     cellar :any

diff --git a/Formula/mkvtoolnix.rb b/Formula/mkvtoolnix.rb
@@ -3,6 +3,7 @@ class Mkvtoolnix < Formula
   homepage "https://www.bunkus.org/videotools/mkvtoolnix/"
   url "https://mkvtoolnix.download/sources/mkvtoolnix-22.0.0.tar.xz"
   sha256 "88c5074d6731b65d5c2ddd02113ae064373eb83ef3e6e00a04876f88c0be7f67"
+  revision 1
 
   bottle do
     sha256 "2ab3b01fc03c882a07c6c8835cf3866f5176476b885bbe4149d6b23ee18e17a9" => :high_sierra

diff --git a/Formula/monero.rb b/Formula/monero.rb
@@ -3,7 +3,7 @@ class Monero < Formula
   homepage "https://getmonero.org/"
   url "https://github.com/monero-project/monero/archive/v0.11.1.0.tar.gz"
   sha256 "b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b"
-  revision 1
+  revision 2
 
   bottle do
     sha256 "231da78ff54b02f7dee6b10373e80df3dad7affecf48f60d2f260b4e739105a6" => :high_sierra
@@ -13,7 +13,7 @@ class Monero < Formula
 
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
-  depends_on "boost"
+  depends_on "boost@1.60"
   depends_on "miniupnpc"
   depends_on "openssl"
   depends_on "readline"

diff --git a/Formula/ncmpcpp.rb b/Formula/ncmpcpp.rb
@@ -3,6 +3,7 @@ class Ncmpcpp < Formula
   homepage "https://rybczak.net/ncmpcpp/"
   url "https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.8.2.tar.bz2"
   sha256 "650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554"
+  revision 1
 
   bottle do
     cellar :any

diff --git a/Formula/openimageio.rb b/Formula/openimageio.rb
@@ -3,6 +3,7 @@ class Openimageio < Formula
   homepage "http://openimageio.org/"
   url "https://github.com/OpenImageIO/oiio/archive/Release-1.8.10.tar.gz"
   sha256 "9bc86cbc1df67285134bb4ac0ed7a450d52dfe75423577c469cae809a1154665"
+  revision 1
   head "https://github.com/OpenImageIO/oiio.git"
 
   bottle do
@@ -46,7 +47,8 @@ def install
     ]
 
     mkdir "build-with-python2" do
-      system "cmake", "..", *args
+      system "cmake", "..", "-DBoost_PYTHON_LIBRARIES=#{Formula["boost-python"].opt_lib}/libboost_python27-mt.dylib",
+                            *args
       system "make", "install"
     end
 
@@ -62,7 +64,7 @@ def install
 
     # CMake picks up boost-python instead of boost-python3
     args << "-DBOOST_ROOT=#{Formula["boost"].opt_prefix}"
-    args << "-DBoost_PYTHON_LIBRARIES=#{Formula["boost-python3"].opt_lib}/libboost_python3-mt.dylib"
+    args << "-DBoost_PYTHON_LIBRARIES=#{Formula["boost-python3"].opt_lib}/libboost_python36-mt.dylib"
 
     # This is strange, but must be set to make the hack above work
     args << "-DBoost_PYTHON_LIBRARY_DEBUG=''"

diff --git a/Formula/osquery.rb b/Formula/osquery.rb
@@ -4,7 +4,7 @@ class Osquery < Formula
   # pull from git tag to get submodules
   url "https://github.com/facebook/osquery/archive/3.2.2.tar.gz"
   sha256 "160ee0df73fa5e5621ca2798d58f6b1588a05ac6ee5a7315a207d74a26ec328e"
-  revision 1
+  revision 2
 
   bottle do
     cellar :any

diff --git a/Formula/osrm-backend.rb b/Formula/osrm-backend.rb
@@ -3,6 +3,7 @@ class OsrmBackend < Formula
   homepage "http://project-osrm.org/"
   url "https://github.com/Project-OSRM/osrm-backend/archive/v5.16.4.tar.gz"
   sha256 "c2b014cfa65deee0b8ee2c94893362951ebc42684710fa8d9f3d1ecfeb927da4"
+  revision 1
   head "https://github.com/Project-OSRM/osrm-backend.git"
 
   bottle do

diff --git a/Formula/pdftoedn.rb b/Formula/pdftoedn.rb
@@ -3,7 +3,7 @@ class Pdftoedn < Formula
   homepage "https://github.com/edporras/pdftoedn"
   url "https://github.com/edporras/pdftoedn/archive/v0.34.3.tar.gz"
   sha256 "7ff6d097d1a53246b3c71d9fdaeb58e43aac14291f647d76855c62769c585f25"
-  revision 9
+  revision 10
 
   bottle do
     cellar :any

diff --git a/Formula/povray.rb b/Formula/povray.rb
@@ -3,6 +3,7 @@ class Povray < Formula
   homepage "http://www.povray.org/"
   url "https://github.com/POV-Ray/povray/archive/v3.7.0.7.tar.gz"
   sha256 "085746e891edbb2cfda22bb2a8b86043bd680a68ad9121bc568118c730ace7b9"
+  revision 1
 
   bottle do
     sha256 "35f5427c7f206b4964e0d0fbf76bd03f3796b0afc8622790f962c318c92fb298" => :high_sierra

diff --git a/Formula/pyexiv2.rb b/Formula/pyexiv2.rb
@@ -3,7 +3,7 @@ class Pyexiv2 < Formula
   homepage "https://launchpad.net/pyexiv2"
   url "https://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/pyexiv2-0.3.2.tar.bz2"
   sha256 "0abc117c6afa71f54266cb91979a5227f60361db1fcfdb68ae9615398d7a2127"
-  revision 4
+  revision 5
 
   bottle do
     sha256 "5562c48fe257fb472957019ee435d38bc2b3d593dd4e202e3422f6547d9a91c5" => :high_sierra
@@ -24,7 +24,7 @@ def install
     ENV.append "CXXFLAGS", "-I#{Formula["exiv2"].include}"
     ENV.append "LDFLAGS", "-undefined dynamic_lookup"
 
-    scons "BOOSTLIB=boost_python-mt"
+    scons "BOOSTLIB=boost_python27-mt"
 
     # let's install manually
     mv "build/libexiv2python.dylib", "build/libexiv2python.so"

diff --git a/Formula/source-highlight.rb b/Formula/source-highlight.rb
@@ -5,7 +5,7 @@ class SourceHighlight < Formula
   mirror "https://ftpmirror.gnu.org/src-highlite/source-highlight-3.1.8.tar.gz"
   mirror "https://fossies.org/linux/www/source-highlight-3.1.8.tar.gz"
   sha256 "01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3"
-  revision 8
+  revision 9
 
   bottle do
     sha256 "3101cb3776039eba399f7a9d42cbd68120abaa2c3fd02401bd43128020bdf22c" => :high_sierra

diff --git a/Formula/uhd.rb b/Formula/uhd.rb
@@ -3,6 +3,7 @@ class Uhd < Formula
   homepage "https://files.ettus.com/manual/"
   url "https://github.com/EttusResearch/uhd/archive/v3.11.0.1.tar.gz"
   sha256 "b8b0aa9ca347353333c2d6f52193a01b6c7dbcdaf5e21250c00210d3f8b0fabd"
+  revision 1
   head "https://github.com/EttusResearch/uhd.git"
 
   bottle do
@@ -18,6 +19,12 @@ class Uhd < Formula
   depends_on "doxygen" => [:build, :optional]
   depends_on "gpsd" => :optional
 
+  # Upstream PR from 14 Apr 2018 "Unbreak build against Boost 1.67"
+  patch do
+    url "https://github.com/EttusResearch/uhd/pull/170.patch?full_index=1"
+    sha256 "2a4d24c1fa5053bf81f283e203d47fd880fad2e60ea291e58154ff72d330eb50"
+  end
+
   resource "Mako" do
     url "https://files.pythonhosted.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/Mako-1.0.7.tar.gz"
     sha256 "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"