From f6834007e7854372363b92e20ac851cdd53cfc7b Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Mon, 21 Oct 2019 19:32:03 +0200 Subject: [PATCH] aamath: fix patch Closes #45660. Signed-off-by: FX Coudert --- Formula/aamath.rb | 69 +++-------------------------------------------- 1 file changed, 4 insertions(+), 65 deletions(-) diff --git a/Formula/aamath.rb b/Formula/aamath.rb index d70ff80b82..76c3b92fce 100644 --- a/Formula/aamath.rb +++ b/Formula/aamath.rb @@ -17,7 +17,10 @@ class Aamath < Formula # Fix build on clang; patch by Homebrew team # https://github.com/Homebrew/homebrew/issues/23872 - patch :DATA + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/aamath/0.3.patch" + sha256 "9443881d7950ac8d2da217a23ae3f2c936fbd6880f34dceba717f1246d8608f1" + end def install ENV.deparallelize @@ -33,67 +36,3 @@ class Aamath < Formula assert_match /#{Regexp.escape("f(x + h) = f(x) + h f'(x)")}/, s end end - -__END__ -diff --git a/expr.cc b/expr.cc -index 7bc0ee3..8f4eaf7 100644 ---- a/expr.cc -+++ b/expr.cc -@@ -1192,7 +1192,7 @@ IntegralOnInterval::render_head() const - - class SumSymbol : public OpSymbol { - public: -- void render(Canvas& c, int r, int c) const; -+ void render(Canvas& canvas, int r, int c) const; - }; - - void -@@ -1208,7 +1208,7 @@ SumSymbol::render(Canvas& canvas, int r, int c) const - - class ProductSymbol : public OpSymbol { - public: -- void render(Canvas& c, int r, int c) const; -+ void render(Canvas& canvas, int r, int c) const; - }; - - void -@@ -1612,7 +1612,7 @@ Matrix::render() const - int cols = num_cols(); - int rows = num_rows(); - -- CanvasPtr ec[cols * rows]; -+ CanvasPtr *ec = new CanvasPtr[cols * rows]; - Size sz[cols * rows]; - - int row_height[rows]; -@@ -1692,6 +1692,8 @@ Matrix::render() const - - canvas->center(); - -+ delete[] ec; -+ - return canvas; - } - -diff --git a/expr.h b/expr.h -index 000ebd4..d233da9 100644 ---- a/expr.h -+++ b/expr.h -@@ -451,7 +451,7 @@ class Integral : public OpOnFunction { - - virtual CanvasPtr render_head() const; - -- void render_symbol(Canvas& c, int r, int c, int h) const; -+ void render_symbol(Canvas& canvas, int r, int c, int h) const; - - virtual CanvasPtr render() const; - }; -@@ -467,7 +467,7 @@ class IntegralOnInterval : public Integral, public OpOverInterval { - - class OpSymbol { - public: -- virtual void render(Canvas& c, int r, int c) const = 0; -+ virtual void render(Canvas& canvas, int r, int c) const = 0; - }; - - class SumOrProduct : public OpOnFunction {