me/guix
Archived
1
0
Fork 0
Code Activity

gnu: QGIS: Build without QtWebKit.

Browse source 
See <https://issues.guix.gnu.org/53289> and <https://issues.guix.gnu.org/53512>
for more information about this change.

* gnu/packages/geo.scm (qgis)[inputs]: Remove qtwebkit.
[arguments]: Pass "-DWITH_QTWEBKIT=NO" to #:configure-flags. Make the
custom 'check' phase honor TESTS?. Skip even more failing tests.
This commit is contained in:
Leo Famulari 2022-01-23 16:04:26 -05:00
parent 676de0a34c
commit 4235c6ee92
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/geo.scm
View file

@ -2274,6 +2274,8 @@ growing set of geoscientific methods.")
#:imported-modules (,@%cmake-build-system-modules #:imported-modules (,@%cmake-build-system-modules
(guix build python-build-system) (guix build python-build-system)
(guix build qt-utils)) (guix build qt-utils))
#:configure-flags
'("-DWITH_QTWEBKIT=NO")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Configure correct path to PyQt5 SIP directory ;; Configure correct path to PyQt5 SIP directory
@ -2320,7 +2322,8 @@ growing set of geoscientific methods.")
(("^REV=.*") "REV=currentrev\n")) (("^REV=.*") "REV=currentrev\n"))
#t)) #t))
(replace 'check (replace 'check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs tests? #:allow-other-keys)
(when tests?
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
@ -2400,11 +2403,14 @@ growing set of geoscientific methods.")
"qgis_imagecachetest" "qgis_imagecachetest"
"qgis_labelingenginetest" "qgis_labelingenginetest"
"qgis_layouthtmltest" "qgis_layouthtmltest"
"qgis_layoutlabeltest"
"qgis_layoutmanualtabletest" "qgis_layoutmanualtabletest"
"qgis_layoutmapgridtest" "qgis_layoutmapgridtest"
"qgis_layoutmaptest" "qgis_layoutmaptest"
"qgis_layoutmultiframetest"
"qgis_layoutpicturetest" "qgis_layoutpicturetest"
"qgis_layouttabletest" "qgis_layouttabletest"
"qgis_layouttest"
"qgis_mapdevicepixelratiotest" "qgis_mapdevicepixelratiotest"
"qgis_maprendererjobtest" "qgis_maprendererjobtest"
"qgis_ogrproviderguitest" "qgis_ogrproviderguitest"
@ -2421,7 +2427,7 @@ growing set of geoscientific methods.")
"qgis_taskmanagertest" "qgis_taskmanagertest"
"qgis_wcsprovidertest" "qgis_wcsprovidertest"
"qgis_ziplayertest") "qgis_ziplayertest")
"|")))) "|")))))
(add-after 'install 'wrap-python (add-after 'install 'wrap-python
(assoc-ref python:%standard-phases 'wrap)) (assoc-ref python:%standard-phases 'wrap))
(add-after 'wrap-python 'wrap-qt (add-after 'wrap-python 'wrap-qt
@ -2490,7 +2496,6 @@ growing set of geoscientific methods.")
qtlocation qtlocation
qtserialport qtserialport
qtsvg qtsvg
qtwebkit
qwt qwt
;;("saga" ,saga) ;;("saga" ,saga)
sqlite)) sqlite))