gnu: libspatialite: Update dependencies.
* gnu/packages/geo.scm (libspatialite, spatialite-tools): Update dependencies. [inputs]: Replace proj.4 with proj and remove zlib which is not used anymore since libspatialite started using minizip. (libspatialite)[arguments]: Fix regex to not disable more tests than necessary. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
parent
fba2fa7ed8
commit
109f13c098
1 changed files with 5 additions and 7 deletions
|
@ -442,9 +442,8 @@ writing GeoTIFF information tags.")
|
||||||
("librttopo" ,librttopo)
|
("librttopo" ,librttopo)
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("minizip" ,minizip)
|
("minizip" ,minizip)
|
||||||
("proj.4" ,proj.4)
|
("proj" ,proj)
|
||||||
("sqlite" ,sqlite)
|
("sqlite" ,sqlite)))
|
||||||
("zlib" ,zlib)))
|
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
'("--enable-rttopo=yes")
|
'("--enable-rttopo=yes")
|
||||||
|
@ -454,7 +453,7 @@ writing GeoTIFF information tags.")
|
||||||
(add-after 'unpack 'ignore-broken-tests
|
(add-after 'unpack 'ignore-broken-tests
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* '("test/Makefile.in")
|
(substitute* '("test/Makefile.in")
|
||||||
(("\tcheck_sql_stm.*" all) "\tcheck_multithread$(EXEEXT) \\\n")
|
(("\tcheck_sql_stmt.* (check_sql_.*)" all tiny) (string-append "\t" tiny))
|
||||||
(("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n"))
|
(("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n"))
|
||||||
(("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4)))
|
(("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4)))
|
||||||
#t)))))
|
#t)))))
|
||||||
|
@ -1748,10 +1747,9 @@ associated attribute file (@file{.dbf}).")
|
||||||
("libspatialite" ,libspatialite)
|
("libspatialite" ,libspatialite)
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("minizip" ,minizip)
|
("minizip" ,minizip)
|
||||||
("proj.4" ,proj.4)
|
("proj" ,proj)
|
||||||
("readosm" ,readosm)
|
("readosm" ,readosm)
|
||||||
("sqlite" ,sqlite)
|
("sqlite" ,sqlite)))
|
||||||
("zlib" ,zlib)))
|
|
||||||
(synopsis "Collection of command line tools for SpatiaLite")
|
(synopsis "Collection of command line tools for SpatiaLite")
|
||||||
(description
|
(description
|
||||||
"@code{spatialite-tools} is a collection of Command Line Interface (CLI)
|
"@code{spatialite-tools} is a collection of Command Line Interface (CLI)
|
||||||
|
|
Reference in a new issue