diff options
Diffstat (limited to 'gnu/packages/geo.scm')
-rw-r--r-- | gnu/packages/geo.scm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index bf864f246c..7010d24ed5 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -488,14 +488,12 @@ coverages using a SpatiaLite DBMS.") '("--enable-rttopo=yes") #:phases (modify-phases %standard-phases - ;; 3 tests are failing, ignore them: + ;; 1 test is failing, ignore it: (add-after 'unpack 'ignore-broken-tests (lambda _ (substitute* '("test/Makefile.in") - (("\tcheck_sql_stmt.* (check_sql_.*)" all tiny) (string-append "\t" tiny)) - (("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n")) - (("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4))) - #t))))) + (("check_wms\\$\\(EXEEXT\\) check_drop_rename\\$\\(EXEEXT\\) ") + "check_wms$(EXEEXT) "))))))) (synopsis "Extend SQLite to support Spatial SQL capabilities") (description "SpatiaLite is a library intended to extend the SQLite core to support @@ -1890,7 +1888,8 @@ exchanged form one Spatial DBMS and the other.") `(#:configure-flags '("-DENABLE_PORTAUDIO=ON" "-DENABLE_SNDFILE=ON" "-DBUNDLE_TCDATA=ON" - "-DBUNDLE_GSHHS=CRUDE") + "-DBUNDLE_GSHHS=CRUDE" + "-DCMAKE_C_FLAGS=-fcommon") #:tests? #f ; No tests defined #:phases (modify-phases %standard-phases @@ -1976,8 +1975,7 @@ track your position right from your laptop.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((shell (string-append (assoc-ref inputs "bash") - "/bin/bash"))) + (let ((shell (search-input-file inputs "/bin/bash"))) (setenv "SHELL" shell) (setenv "CONFIG_SHELL" shell) (setenv "LDFLAGS" (string-append "-Wl,-rpath -Wl," @@ -2150,8 +2148,7 @@ growing set of geoscientific methods.") (replace 'check (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "TRAVIS" "true") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") @@ -2173,6 +2170,7 @@ growing set of geoscientific methods.") "PyCoreAdittions" "PyQgsAnnotation" "PyQgsAppStartup" + "PyQgsAuthBasicMethod" "PyQgsAuthenticationSystem" "PyQgsAuxiliaryStorage" "PyQgsDBManagerGpkg" |