From patchwork Fri Oct 15 09:30:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 33892 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 A9D2C27BBE3; Fri, 15 Oct 2021 10:49:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 12F6327BBE1 for ; Fri, 15 Oct 2021 10:49:45 +0100 (BST) Received: from localhost ([::1]:57114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbJqS-0003dR-2V for patchwork@mira.cbaines.net; Fri, 15 Oct 2021 05:49:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbJZO-0004SV-KY for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbJZO-0006YU-CB for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbJZO-0005f2-7W for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50862] [PATCH core-updates-frozen 08/19] gnu: KDE Plasma: Update to 5.22.5. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Oct 2021 09:32:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50862@debbugs.gnu.org Received: via spool by 50862-submit@debbugs.gnu.org id=B50862.163429030921608 (code B ref 50862); Fri, 15 Oct 2021 09:32:06 +0000 Received: (at 50862) by debbugs.gnu.org; 15 Oct 2021 09:31:49 +0000 Received: from localhost ([127.0.0.1]:38153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJZ6-0005cR-BS for submit@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:48 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:31694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJZ1-0005bU-7F for 50862@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:47 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [80.241.60.233]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4HW1HX73BkzQjg6 for <50862@debbugs.gnu.org>; Fri, 15 Oct 2021 11:31:36 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1634290294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HKDv60BTN7OTsb7b4WBSdTiroXiBL4mjw9UVSalJYM8=; b=J/w4sogiPenKPKF80JNkbisZmzA3SLs5o4QfoFqAVGi+touIMiYcttb31ZTwK2hFDDmBll qabPujW9S3BVJAkDakdvW1DOjnpKyf9EQI5086L78DUAO7ggz0AiLbZobjhxcRbcNqmf74 /oGUtAB8j5YxlLFl5k4aAE65OfLV1zny+xeoDLBaPvB1dbtkuA9JtmnvXnHUjOLIV/Kwwv T2o8q560wNqGPvQiLRqHUPsBAMWRrxc93AGnAmU1G+nfMxGDv7+FquMVRULLVRCKmychhK aY39pzjq+6bAWhl/bzxWPxZHnGjipfOy5gOB54auESfUV832BCuZnPneXx828Q== From: Brendan Tildesley Date: Fri, 15 Oct 2021 20:30:04 +1100 Message-Id: <20211015093015.5834-9-mail@brendan.scot> In-Reply-To: <20211015093015.5834-1-mail@brendan.scot> References: <20211015093015.5834-1-mail@brendan.scot> MIME-Version: 1.0 X-Rspamd-Queue-Id: 80BDB26E 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches (breeze, kdecoration, libkscreen, ksshaskpass, kscreenlocker, libksysguard): Update to 5.22.5. (kscreenlocker):[inputs]: Add layer-shell-qt. (libksysguard):[origin]: Fix typo in URI that affecs refresh script. [native-inputs]: Add qttools. [inputs]: Add libnl, libcap, libpcap, qtwebengine, qtwebchannel. [arguments]: Remove uneeeded configure flags hack. Remove Uneeded CMakeLists.txt substitution. Respect #:tests?. --- gnu/packages/kde-plasma.scm | 56 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index eb463a498a..be25fb6afb 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -28,6 +28,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (guix build-system qt) + #:use-module (gnu packages admin) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -35,19 +36,20 @@ #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) (define-public breeze (package (name "breeze") - (version "5.19.5") + (version "5.22.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1")))) + "09ll0bddsbbhz7ihqcn0wbd2llbjrblgk90gp556kpy09jh4rz73")))) (build-system qt-build-system) ;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake: ;; warnings during generation of metainfo for org.kde.breezedark.desktop: @@ -87,14 +89,14 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") (define-public kdecoration (package (name "kdecoration") - (version "5.19.5") + (version "5.22.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "0pn8n7zyb0adzjnn92vmbcf7pmpss60k9k1rk5llamj016xzfgnf")))) + "1vqv44ls79x2d71ldkkkzpk4mzpv110y270wf1gbkmxaxwp20xxm")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -111,14 +113,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public ksshaskpass (package (name "ksshaskpass") - (version "5.19.5") + (version "5.22.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/ksshaskpass-" version ".tar.xz")) (sha256 (base32 - "1k2va2v9051f71w78dn3gihk642iyy5yzrkcfnp97fag8g6dpisi")))) + "0ig2cx80ba57k9mq7bcnmriymjln7kvr81mgm5rsdi4asal2zpgp")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -167,14 +169,14 @@ call it if it is not associated to a terminal.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.19.5") + (version "5.22.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "1fd5sqaqx9kj3kr0bgxpllhcm5arf8bc9pkpd9yk9c8xjy0j0fxi")))) + "107icbr0cdcpbzi5npgx3fw2m2wp1z91k1iw26n595dp3n2czv98")))) (build-system qt-build-system) (arguments `(#:tests? #f ;; TODO: make tests pass @@ -192,7 +194,7 @@ call it if it is not associated to a terminal.") (if tests? (begin (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (invoke "dbus-launch" "ctest" "."))) + (invoke "dbus-launch" "ctest"))) #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -212,6 +214,7 @@ call it if it is not associated to a terminal.") ("kwayland" ,kwayland) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) + ("layer-shell-qt" ,layer-shell-qt) ("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package ("libxcursor" ,libxcursor) ;missing in CMakeList.txt ("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices @@ -232,14 +235,14 @@ call it if it is not associated to a terminal.") (define-public libkscreen (package (name "libkscreen") - (version "5.19.5") + (version "5.22.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0rf1pm0yyc069f4n5s9ipdx4glzfr9zvv5cbrmn4q9i4v6z1qd8i")))) + (base32 "1qqnra28r698kbps6ywk22ncac4sm3f9d9wrwmicp963mkmwlksv")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -262,17 +265,18 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "5.19.5") + (version "5.22.5") (source (origin (method url-fetch) - (uri (string-append "mirror://kde//stable/plasma/" version + (uri (string-append "mirror://kde/stable/plasma/" version "/libksysguard-" version ".tar.xz")) (sha256 - (base32 "1kd0h3p8bf9k5pqp0frhr81pa0yyrpkckg9zznirk9p1v88v7bfq")))) + (base32 "1hkjsjfl4hsxbk998hpq4f38rahqfx6nmznbh0dqrymadfbsn8m5")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("kconfigwidgets" ,kconfigwidgets) ("kiconthemes" ,kiconthemes) @@ -288,30 +292,28 @@ basic needs and easy to configure for those who want special setups.") ("knewstuff" ,knewstuff) ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) + ("libnl" ,libnl) + ("libcap" ,libcap) + ("libpcap" ,libpcap) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) + ("qtwebengine" ,qtwebengine) + ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("plasma" ,plasma-framework) ("zlib" ,zlib))) (build-system qt-build-system) (arguments - `(#:configure-flags - `(,(string-append "-DKDE_INSTALL_DATADIR=" - (assoc-ref %outputs "out") "/share")) - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-cmakelists - (lambda _ - ;; TODO: Verify: This should no longer be necessary, since - ;; KF5AuthConfig.cmake.in contains this already. - (substitute* "processcore/CMakeLists.txt" - (("KAUTH_HELPER_INSTALL_DIR") "KDE_INSTALL_LIBEXECDIR")))) (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; TODO: Fix this failing test-case - (invoke "ctest" "-E" "processtest")))))) + (when tests? + (invoke "ctest" "-E" "processtest")) + #t))))) (home-page "https://userbase.kde.org/KSysGuard") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and