Skip to content
Snippets Groups Projects
Unverified Commit 03ac4824 authored by Hartmut Goebel's avatar Hartmut Goebel
Browse files

gnu: kde frameworks: Avoid requiring xorg-server for tests.

Some packages started a x.org server for testing, which can be
avoided by setting QT_QPA_PLATFORM=offscreen.

* gnu/packages/kde-frameworks.scm (kitemmodels)
  [native-inputs]: Remove xorg-server.
  [arguments]<#phases> 'start-xorg-server' replace by 'check-setup'.
  (kplotting, kcrash, kimageformats): Likewise.
  (kitemviews)[native-inputs]: Remove xorg-server.
  [arguments]<#phases> 'start-xorg-server': Remove phase; 'check-setup':
  set QT_QPA_PLATFORM=offscreen.
parent 72b073ca
No related branches found
No related tags found
No related merge requests found
...@@ -744,20 +744,17 @@ (define-public kitemmodels ...@@ -744,20 +744,17 @@ (define-public kitemmodels
"1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5")))) "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)))
("xorg-server" ,xorg-server)))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'start-xorg-server (add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys) (lambda _
;; The test suite requires a running X server. ;; make Qt render "offscreen", required for tests
(system (string-append (assoc-ref inputs "xorg-server") (setenv "QT_QPA_PLATFORM" "offscreen")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Set of item models extending the Qt model-view framework") (synopsis "Set of item models extending the Qt model-view framework")
...@@ -807,8 +804,7 @@ (define-public kitemviews ...@@ -807,8 +804,7 @@ (define-public kitemviews
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("qttools" ,qttools) ("qttools" ,qttools)))
("xorg-server" ,xorg-server)))
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)))
(arguments (arguments
...@@ -817,13 +813,8 @@ (define-public kitemviews ...@@ -817,13 +813,8 @@ (define-public kitemviews
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda _ (lambda _
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0")
#t)) ;; make Qt render "offscreen", required for tests
(add-before 'check 'start-xorg-server (setenv "QT_QPA_PLATFORM" "offscreen")
(lambda* (#:key inputs #:allow-other-keys)
;; The test suite requires a running X server.
(system (string-append (assoc-ref inputs "xorg-server")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Set of item views extending the Qt model-view framework") (synopsis "Set of item views extending the Qt model-view framework")
...@@ -847,19 +838,16 @@ (define-public kplotting ...@@ -847,19 +838,16 @@ (define-public kplotting
"1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh")))) "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)))
("xorg-server" ,xorg-server)))
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'start-xorg-server (add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys) (lambda _ ; kplotting
;; The test suite requires a running X server. ;; make Qt render "offscreen", required for tests
(system (string-append (assoc-ref inputs "xorg-server") (setenv "QT_QPA_PLATFORM" "offscreen")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Data plotting library") (synopsis "Data plotting library")
...@@ -1338,8 +1326,7 @@ (define-public kcrash ...@@ -1338,8 +1326,7 @@ (define-public kcrash
"1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3")))) "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)))
("xorg-server" ,xorg-server)))
(inputs (inputs
`(("kcoreaddons" ,kcoreaddons) `(("kcoreaddons" ,kcoreaddons)
("kwindowsystem" ,kwindowsystem) ("kwindowsystem" ,kwindowsystem)
...@@ -1348,12 +1335,10 @@ (define-public kcrash ...@@ -1348,12 +1335,10 @@ (define-public kcrash
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'start-xorg-server (add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys) (lambda _
;; The test suite requires a running X server. ;; make Qt render "offscreen", required for tests
(system "Xvfb :1 &") (setenv "QT_QPA_PLATFORM" "offscreen")
(sleep 2) ;XXX: give the server enough time to start
(setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Graceful handling of application crashes") (synopsis "Graceful handling of application crashes")
...@@ -1476,19 +1461,16 @@ (define-public kimageformats ...@@ -1476,19 +1461,16 @@ (define-public kimageformats
"0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw")))) "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)))
("xorg-server" ,xorg-server)))
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'start-xorg-server (add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys) (lambda _
;; The test suite requires a running X server. ;; make Qt render "offscreen", required for tests
(system (string-append (assoc-ref inputs "xorg-server") (setenv "QT_QPA_PLATFORM" "offscreen")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1")
#t))))) #t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Plugins to allow QImage to support extra file formats") (synopsis "Plugins to allow QImage to support extra file formats")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment