libspatialite 4.1.1, spatialite-tools 4.1.1, spatialite-gui 1.7.1

Closes #21110.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

3 files changed, 16 insertions, 12 deletions

diff --git a/Library/Formula/libspatialite.rb b/Library/Formula/libspatialite.rb
index fd3186549..141ba453e 100644
--- a/Library/Formula/libspatialite.rb
+++ b/Library/Formula/libspatialite.rb
@@ -2,19 +2,21 @@ require 'formula'
 
 class Libspatialite < Formula
   homepage 'https://www.gaia-gis.it/fossil/libspatialite/index'
-  url 'http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.1.0.tar.gz'
-  sha1 '33b45f3d00f6ba633c6e4d95387336e132a1d2e3'
+  url 'http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.1.1.tar.gz'
+  sha1 'b8ed50fb66c4a898867cdf9d724d524c5e27e8aa'
 
   option 'without-freexl', 'Build without support for reading Excel files'
+  option 'without-libxml2', 'Disable support for xml parsing (parsing needed by spatialite-gui)'
   option 'with-postgis', 'Enable additional sanitization/segmentation routines provided by PostGIS 2.0+'
 
+  depends_on 'pkg-config' => :build
   depends_on 'proj'
   depends_on 'geos'
   # Needs SQLite > 3.7.3 which rules out system SQLite on Snow Leopard and
   # below. Also needs dynamic extension support which rules out system SQLite
   # on Lion. Finally, RTree index support is required as well.
   depends_on 'sqlite'
-
+  depends_on 'libxml2' => :recommended
   depends_on 'freexl' => :recommended
   depends_on 'postgis' => :optional
 
@@ -30,7 +32,8 @@ class Libspatialite < Formula
       --with-sysroot=#{HOMEBREW_PREFIX}
     ]
     args << '--enable-freexl=no' if build.without? 'freexl'
-    args << '--enable-lwgeom' if build.with? 'lwgeom'
+    args << '--enable-libxml2=yes' unless build.without? 'libxml2'
+    args << '--enable-lwgeom' if build.with? 'postgis'
 
     system './configure', *args
     system "make install"
diff --git a/Library/Formula/spatialite-gui.rb b/Library/Formula/spatialite-gui.rb
index ce20bb526..aecf1f915 100644
--- a/Library/Formula/spatialite-gui.rb
+++ b/Library/Formula/spatialite-gui.rb
@@ -6,13 +6,14 @@ class SpatialiteGui < Formula
   sha1 'b8cfe3def8c77928f7c9fcc86bae3c99179fa486'
 
   devel do
-    url 'http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-1.6.0.tar.gz'
-    sha1 'd06944273b1e19cdd5c17a463582e074f8548ccd'
+    url 'http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-1.7.1.tar.gz'
+    sha1 '3b9d88e84ffa5a4f913cf74b098532c2cd15398f'
   end
 
+  depends_on 'pkg-config' => :build
   depends_on 'libspatialite'
   depends_on 'libgaiagraphics'
-
+  depends_on 'libxml2' if build.devel?
   depends_on 'wxmac'
 
   def patches
@@ -60,7 +61,7 @@ index a857e8a..9c90afb 100644
 @@ -71,6 +71,12 @@
  #define unlink	_unlink
  #endif
- 
+
 +#ifdef __WXMAC__
 +// Allow the program to run and recieve focus without creating an app bundle.
 +#include <Carbon/Carbon.h>
@@ -91,6 +92,6 @@ index a857e8a..9c90afb 100644
 +
    return true;
  }
- 
--- 
+
+--
 1.7.9
diff --git a/Library/Formula/spatialite-tools.rb b/Library/Formula/spatialite-tools.rb
index b554401ff..83edf640f 100644
--- a/Library/Formula/spatialite-tools.rb
+++ b/Library/Formula/spatialite-tools.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class SpatialiteTools < Formula
   homepage 'https://www.gaia-gis.it/fossil/spatialite-tools/index'
-  url 'http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.1.0.tar.gz'
-  sha1 '8c5edbed7e3326a679b336532e0add313b2af8b5'
+  url 'http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-4.1.1.tar.gz'
+  sha1 '0af3de926b8086287ef31ebba5d8327ee18d14bd'
 
   depends_on 'pkg-config' => :build