From 03ac48248b104becf026418ef0cef9fedfff9bbb Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 15 May 2017 22:25:28 +0200 Subject: [PATCH] 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. --- gnu/packages/kde-frameworks.scm | 64 ++++++++++++--------------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0354e1d7fd..5fe457fb3b 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -744,20 +744,17 @@ (define-public kitemmodels "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("xorg-server" ,xorg-server))) + `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (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") + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") @@ -807,8 +804,7 @@ (define-public kitemviews (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -817,13 +813,8 @@ (define-public kitemviews (add-before 'check 'check-setup (lambda _ (setenv "DBUS_FATAL_WARNINGS" "0") - #t)) - (add-before 'check 'start-xorg-server - (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") + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item views extending the Qt model-view framework") @@ -847,19 +838,16 @@ (define-public kplotting "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("xorg-server" ,xorg-server))) + `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (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") + (add-before 'check 'check-setup + (lambda _ ; kplotting + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") @@ -1338,8 +1326,7 @@ (define-public kcrash "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("xorg-server" ,xorg-server))) + `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("kcoreaddons" ,kcoreaddons) ("kwindowsystem" ,kwindowsystem) @@ -1348,12 +1335,10 @@ (define-public kcrash (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (sleep 2) ;XXX: give the server enough time to start - (setenv "DISPLAY" ":1") + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") @@ -1476,19 +1461,16 @@ (define-public kimageformats "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw")))) (build-system cmake-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("xorg-server" ,xorg-server))) + `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase))) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (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") + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugins to allow QImage to support extra file formats")