From patchwork Sun Jul 23 08:46:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 52120 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 15D0A27BBE2; Sun, 23 Jul 2023 12:50:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EDF2B27BBEA for ; Sun, 23 Jul 2023 12:50:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNXbG-0002n5-7F; Sun, 23 Jul 2023 07:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNXbC-0002lj-3m for guix-patches@gnu.org; Sun, 23 Jul 2023 07:50:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNXbB-0002Km-ST for guix-patches@gnu.org; Sun, 23 Jul 2023 07:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNXbB-0006Ng-NE for guix-patches@gnu.org; Sun, 23 Jul 2023 07:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 184/209] gnu: plasma-workspace: Update to 5.27.6. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 11:50:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.169011299524442 (code B ref 64798); Sun, 23 Jul 2023 11:50:05 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 11:49:55 +0000 Received: from localhost ([127.0.0.1]:38869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNXb0-0006M3-IG for submit@debbugs.gnu.org; Sun, 23 Jul 2023 07:49:54 -0400 Received: from out203-205-221-190.mail.qq.com ([203.205.221.190]:56095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNXas-0006KN-84 for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 07:49:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690112977; bh=hKI/YAlOnfrBGTx999JDMJKR6/hVwDfVe+U9IHdakno=; h=From:To:Subject:Date:In-Reply-To:References; b=e0z3S3SVP4/OPqK4KR+pgGHNHee93nkq9xlpeZ4GfT1slfAIa7+wSaNdwqGZgaCL7 +7/h7MAkCvVf32gBaad0wbpXHJ6ofL3rVmHuRpUzHBh1noJGGqNjhNScDPfVru9CRY FGqMZ8ITk7SN8gGvkOotpGjVrl1CCYf3bqwcMjoI= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id C6238E56; Sun, 23 Jul 2023 19:49:34 +0800 X-QQ-mid: xmsmtpt1690112976thdlji8mz Message-ID: X-QQ-XMAILINFO: Nh4l9jvBEbt7XV8dY6kYevig274xvuJmg37HHm/RxFDADgoDLtpc2eSLuKbaDS Xaq5Y3Kvp9V5bKAvtLZsHOCZ/2N1SOCsoqZ9qGo6qAL36NFvSEhV5+JSGnrw3yRuNshPabQbdaIb 1rjYQvTT24eU3otr3xZPuRm69IfrK1swwTMk8SDlp4q2yKCpzfkh/+xmohoG2v3cX8rnPs0IPN8G tb/ZXKiOloH2CB7mm43bJ7Ld88O6+v7KVHTor87HR/B7MJ+0S8Mfn59VUcW2ASz4jExXPsMaVYuA mZgP5ufCLG7xpFwsNOPQKz3x99etHyVhXYfbVaBQipThh/Bu/q/7sIATflXEIE5HrAsB+l73FMnr EGufizVDP1ZaDTq+qLcLIOdff+Ip3qyqjKWTtT1W/cZm+JVZDryumkbIygSGmhWjweE0GrHGYJM0 qHVsVp07kMQVJfdeS6Q7MKLbNr3j9eLCnuphJAulpNq1aXmfakPy11gyjoZ6yHLIlmb9zwimh/8o Vxb9Pd5m2DUHmaa92/h4GusZZw1YUP9xiF+6ui5aPf097GTjhMzxsqzFEms0Pr+G0okAgaX6PQZH C/pbCTNblSko4N6AEnWoOplohY9v8iOfsDUDj3wana+mFj/nPQS1XCwKVEBkbHvuKdroAm5fvkr+ uWAs4PDteihgrB215HwjCD62hOQ3gAEE3IurRDfZWMuNtT9EbJwxQOauJvCFWBIMB0zokdFtGiTL T3QGa5dBuMrX4hI1aAYBaQiy/OxxC2/flGK4b5NtvCD3fYcDGHzAl8oNOuXXsKrz9K25CjHfUhue +RPs48+S3jOlPaS4TAFEag61RpP7vEHrLUZg+7lKqyXA1MgNbDa3bQjE3hF2J9KLWBeDpXBWCAGT 06Jo7+tJHTZ08pgiTBInpwATsat4wrhIMy3Q5VhQFR8J2Qy8APsaqU6tx9hHlnauWpzmfOu8iuE4 0+l3zAW6g8xqUl2RkmFm92O8xrXOYe2UQgAtfMN07U6QJt9omoH5c9qG/Gb037cQYtmBIAKguT+K 1L8QVvjg== X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= Date: Sun, 23 Jul 2023 16:46:44 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-plasma.scm (plasma-workspace): Update to 5.27.6. [native-inputs]: add xorg-server-for-tests. [inputs]: add polkit-qt, libxcursor, libkexiv2, gpsd. --- gnu/packages/kde-plasma.scm | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 82c76a171c..0bcd65060d 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -77,6 +77,7 @@ (define-module (gnu packages kde-plasma) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages base) + #:use-module (gnu packages gps) #:use-module (gnu packages web)) (define-public bluedevil @@ -2280,17 +2281,18 @@ (define-public plasma-welcome (define-public plasma-workspace (package (name "plasma-workspace") - (version "5.25.5") + (version "5.27.6") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x")))) + "10w8ix9c29gvykr9970aax7jcz2fi99cafr1kknvj2drgc7zgrhw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg-5 - qttools-5)) + qttools-5 + xorg-server-for-tests)) (inputs (list appmenu-gtk-module appstream-qt baloo @@ -2368,13 +2370,18 @@ (define-public plasma-workspace xrdb xmessage xsetroot + polkit-qt + + libxcursor + libkexiv2 + gpsd zlib)) (arguments (list #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-wallpaper (lambda* (#:key inputs #:allow-other-keys) - (substitute* "sddm-theme/theme.conf.cmake" + (substitute* "lookandfeel/sddm-theme/theme.conf.cmake" (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.") (string-append "background=" #$(this-package-input "breeze") @@ -2405,6 +2412,8 @@ (define-public plasma-workspace (add-after 'install 'check-after-install (lambda* (#:key tests? #:allow-other-keys) (when tests? + (setenv "DISPLAY" ":1") + (system "Xvfb +extension GLX :1 &") (setenv "HOME" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) @@ -2413,8 +2422,17 @@ (define-public plasma-workspace (string-append #$output "/lib/qt5/plugins:" (getenv "QT_PLUGIN_PATH"))) - (invoke "ctest" "-E" - "(appstreamtest|lookandfeel-kcmTest|tst_triangleFilter|systemtraymodeltest|testdesktop| screenpooltest)"))))))) + (setenv "QML2_IMPORT_PATH" + (string-append #$output + "/lib/qt5/qml:" + (getenv "QML2_IMPORT_PATH"))) + (invoke "dbus-launch" "ctest" + "--output-on-failure" + "--rerun-failed" + "-E" + "(appstreamtest|tasksmodeltest|shelltest|\ +testimagefinder|systemtraymodeltest|testimagelistmodel|\ +testpackageimagelistmodel|testimageproxymodel|testslidemodel|testdesktop)"))))))) (home-page "https://invent.kde.org/plasma/plasma-workspace") (synopsis "Plasma workspace components") (description