From patchwork Sun Jul 23 08:46:42 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: 52125 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 395B427BBE9; Sun, 23 Jul 2023 12:50:52 +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 5241127BBE2 for ; Sun, 23 Jul 2023 12:50:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNXbB-0002li-S6; Sun, 23 Jul 2023 07:50:05 -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 1qNXbB-0002l2-2E for guix-patches@gnu.org; Sun, 23 Jul 2023 07:50:05 -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 1qNXb9-0002I1-On for guix-patches@gnu.org; Sun, 23 Jul 2023 07:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNXb9-0006NI-L3 for guix-patches@gnu.org; Sun, 23 Jul 2023 07:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 182/209] gnu: kwin: 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:03 +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.169011299324420 (code B ref 64798); Sun, 23 Jul 2023 11:50:03 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 11:49:53 +0000 Received: from localhost ([127.0.0.1]:38863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNXaz-0006Lm-C5 for submit@debbugs.gnu.org; Sun, 23 Jul 2023 07:49:53 -0400 Received: from out203-205-221-191.mail.qq.com ([203.205.221.191]:51211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNXat-0006KL-Ch for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 07:49:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690112976; bh=8J4Pxx2OQ3ylSoyyK7VVrHBjkIzZg2OzcVUALjW7rzo=; h=From:To:Subject:Date:In-Reply-To:References; b=lbptEHg+bQCMbQIZhLHtrobQVxaBRgyjNDNkpLgYt9xA/Fq1/08sg2fsmieY9wduH EXfsOwwsETkBuOe/tCnW9MaONxjlIb5SraXfxoaM5oJhR3h+l+zpszoZGzltZbSAoo AaZ1thA89R0EGGaWqF97M9bJxi2MqRZlqVSzZjm4= 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: xmsmtpt1690112974t0lyfq1ui Message-ID: X-QQ-XMAILINFO: M92Fg570Zuip7W5uc4m4Q397ZBglupx7KrE7RRVFVciRDpGqpKFVfZMS1znnF/ BtFgjuKbACWG1WiShCmKzgnXoB8yTI+amjvXtvg2F8Sxxr50LCJEb4twLJiH3ihUB2AZJQPzkNKO 7++rDT2acsknA3n/jMK62hHU78x1QcPQW4u8PbqSQZSzQ/GpqdmqEcZzaU7uY1N/Mpz4o3ScKNhm BWgtjvrer6Eomfd4T2yPSk416mVdM0HRmn22u426jDhhdpT/mKs9I35X1oYNpBKpmfFGNh32KGhc HxoXLOo1quK2TwwWT+BVIgBwxJW3OR8Rz2k+yENQKJlFaBRIEtygZ6ZKch1xmF6VKj3Bb4pcZPgJ 3K6dz/jI05tge4mwoBXIs5UHDzr0rhkpiDsbuDDnJwORbEU/7ZmBH5KDvE1iA8dD/cs2BBg+tdGg xDNOCEOKPHGyxgO/GhjrAjOK3xn3KpxLIHWu3OfQ64MkvnPBy37dKOvsk75ydkHO509cNGe2q3o0 bw9mhpXkW/6pqgYOWeul37EtQt4NaFT0niZH+UxnKAmLDDKdJpbMOPTHplnTQCKIgXQ+ToUfybJK WH98d7OylDsCeClBv+RaqO2hDDCQpK0qm/uj3VzdFp4ehI9bR7oRz0Tdg1daMFEilVSjotY+WFVu xLzC5e6XZraKEa1HEXR7691BGmhMzxFsFDGexK0DGiz9jY1X9MSQzr3mxJx/zlOyb29mhfu3sJGC pv7LMWwoQ28Cd1RCAiOKd5V/roWab5TaV74gFp80n5NGxzWg51UKhvcSEQZtuvfusQnA9YPyzJS9 fUzyFfjdpwstQmQzZJXlV/yTgDGleN2t3X7MKk2xflDRlRe+xDQjwHlgS/3BRJhN1s0MhIAt28VW x72RZY92Mhec//edwlckFQbGYGuC88s6S+Jvh2hSWhBytJA3OPeULQ1lcyT6oQ60L7jTogb4IQPq AgqEp0XCIX1CbwFgiF/M7I08HJqkoqK7ZTOmTaPBmzwyBEhGg1S6bHtfcyQWahtRVh2fOi/WiyTJ weAbpjumUqdJC0wUf8Ggz0MGczdV4= X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= Date: Sun, 23 Jul 2023 16:46:42 +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 (kwin): Update to 5.27.6. [native-inputs]: use wayland-protocols-next replace wayland-protocols. --- gnu/packages/kde-plasma.scm | 48 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 8248181643..82c76a171c 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1141,14 +1141,14 @@ (define-public kwayland-integration (define-public kwin (package (name "kwin") - (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 - "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2")))) (build-system qt-build-system) (arguments (list @@ -1179,9 +1179,14 @@ (define-public kwin _ a Xwayland b) (string-append a (which "Xwayland") b))) + ;; https://github.com/NixOS/nixpkgs/blob/6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch + (substitute* "src/plugins/qpa/main.cpp" + (("(\\(QLatin1String\\(\"kwin_wayland\"\\)\\))" _ start) + (string-append start " && !QCoreApplication::applicationFilePath()\ +.endsWith(QLatin1String(\".kwin_wayland-real\"))" ))) (substitute* '("cmake/modules/Findhwdata.cmake") (("/usr/share") - (string-append #$hwdata:pnp "/share"))))) + (string-append #$(this-package-input "hwdata") "/share"))))) (add-after 'install 'add-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((kst5 (string-append #$output @@ -1205,27 +1210,26 @@ (define-public kwin (setenv "DISPLAY" ":1") (system "Xvfb :1 &") (sleep 5) - (invoke "ctest" "-E" + (invoke "dbus-launch" + "ctest" + "-E" (string-join - (list "kwayland-testXdgDecoration" - "kwin-testXkb" - "kwin-testPointerInput" - "kwin-testXdgShellWindow" - "kwin-testXdgShellWindow-waylandonly" - "kwin-testSceneOpenGLES" - "kwin-testSceneOpenGLES-waylandonly" - "kwin-testNightColor" - "kwin-testNightColor-waylandonly" - "kwin-testSceneQPainter" - "kwin-testLibinputDevice") - "|")))))))) + (list "kwin-testXkb" + "kwin-testPointerInput" + "kwin-testXdgShellWindow" + "kwin-testXdgShellWindow-waylandonly" + "kwin-testSceneOpenGLES" + "kwin-testSceneOpenGLES-waylandonly" + "kwin-testNightColor" + "kwin-testNightColor-waylandonly") + "|")))))))) (native-inputs (list extra-cmake-modules dbus kdoctools mesa-utils pkg-config qttools-5 - wayland-protocols + wayland-protocols-next xorg-server-for-tests)) (inputs (list breeze eudev