Bump proj patch version

This commit bumps proj from v7.0.0 to v7.0.1, removing the patch
added in the previous formula revision, since it's now been fixed
upstream.

Closes #54135.

Signed-off-by: Thierry Moisan <thierry.moisan@gmail.com>
master
Stephan Hügel 2020-05-02 11:45:24 +01:00 committed by Thierry Moisan
parent 570a6dc676
commit 4011d15675
1 changed files with 2 additions and 12 deletions

View File

@ -1,8 +1,8 @@
class Proj < Formula
desc "Cartographic Projections Library"
homepage "https://proj.org/"
url "https://github.com/OSGeo/PROJ/releases/download/7.0.0/proj-7.0.0.tar.gz"
sha256 "ee0e14c1bd2f9429b1a28999240304c0342ed739ebaea3d4ff44c585b1097be8"
url "https://github.com/OSGeo/PROJ/releases/download/7.0.1/proj-7.0.1.tar.gz"
sha256 "a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f"
bottle do
rebuild 1
@ -34,18 +34,8 @@ class Proj < Formula
sha256 "b9838ae7e5f27ee732fb0bfed618f85b36e8bb56d7afb287d506338e9f33861e"
end
# Fixes https://github.com/OSGeo/PROJ/issues/2064 using https://github.com/OSGeo/PROJ/pull/2067
# Remove after version > 7.0.0
patch do
url "https://github.com/OSGeo/PROJ/commit/d8835f1288207ba9a7e78082050ef61af3ded1e3.diff?full_index=1"
sha256 "9a579a7a0fa33ea8c03639aef95f2b1d22afbc1d5167a927ce0670ff5432719e"
end
def install
(buildpath/"nad").install resource("datumgrid")
# we need to touch these files to stop autoreconf running and then failing due to the patch op above
# Remove touch op after version > 7.0.0
touch ["configure.ac", "aclocal.m4", "configure", "Makefile.am", "Makefile.in", "src/proj_config.h.in"]
system "./autogen.sh" if build.head?
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}"