From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp12.migadu.com ([2001:41d0:403:478a::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms9.migadu.com with LMTPS
	id cE9gJhsUvWToLAEASxT56A
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 23 Jul 2023 13:50:51 +0200
Received: from aspmx1.migadu.com ([2001:41d0:403:478a::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp12.migadu.com with LMTPS
	id UHH6JRsUvWQTCAAAauVa8A
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 23 Jul 2023 13:50:51 +0200
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 53CCB48127
	for <larch@yhetil.org>; Sun, 23 Jul 2023 13:50:51 +0200 (CEST)
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=lbptEHg+;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1690113051;
	h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=8J4Pxx2OQ3ylSoyyK7VVrHBjkIzZg2OzcVUALjW7rzo=;
	b=m14A2a8OQRYDdi0SkIDmIk0Fx25YrhBw51vcYsWoCpmtNMlDO/pVi0Jqe8Omr4YLnCiF4D
	nikqRAZiV/JrLTcLKA7g9rRPfc1gTxleoRU4cjMXZI3HBc0QXCH/BUU3XvboRCELVCqJXQ
	75wAWIDdsIk+y51JqnpdVMWnY07caXjdDWN83AZdrbEFaOCtyI6zWcRLybOE/5fQRFdwih
	LAfWTJWHl/ief4yplhrGMVp1ru+GSUAvnpk+cusyyPSJ4hvh9PMHdSJC388pxB1AtRdmQ+
	GFjIOjqMeRM3RYFephIJwykmKdura3+lsrpY1o6M0Btv6Fm5UVhq7AlIMskblg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=lbptEHg+;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690113051; a=rsa-sha256; cv=none;
	b=XU4Fbdaiz4TUp06+R8arfvnL02oqNT72zwSZ0ZFEruZF4XSTjqxb0pCDiOerLqLtKsvfrx
	m3b2Whw/+IPafKog7DQi0WEKXTXi1+9wfnFZ3lJKeBU5vuCMhm5GtI0M1xHb8GWlLrcvld
	NfiYpq/gaNB75pujr8OMCU/pEXAioiSQ+bK8/02LYclPyVKqV53OKuNrMdYUktvP25VVx/
	HZjbNhMEhHDL/FTPJ1e4ozCELhlkOm/+DR2wlKXIlOH80Kw5dQBW61vtRJHiqnP0DeAs2K
	pKjfl0/HJWSU7PcEK5XBGieQFBQxsH12VXzzPUJpKHTP+LLO6hC9xVK/u+rJgg==
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>) 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" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sun, 23 Jul 2023 11:50:03 +0000
Resent-Message-ID: <handler.64798.B64798.169011299324420@debbugs.gnu.org>
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 <debbugs-submit-bounces@debbugs.gnu.org>)
 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: <tencent_30B6366C733895208BEB2F4A07BE9CAD4405@qq.com>
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: <c0a3435bbddaf65dec534bfbbf02b22b0b9ec09e.1690099027.git.873216071@qq.com>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1690099026.git.873216071@qq.com>
References: <cover.1690099026.git.873216071@qq.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Reply-to:  Zheng Junjie <873216071@qq.com>
X-ACL-Warn: ,  Zheng Junjie via Guix-patches <guix-patches@gnu.org>
From:  Zheng Junjie via Guix-patches via <guix-patches@gnu.org>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Spam-Score: -6.15
X-Migadu-Queue-Id: 53CCB48127
X-Migadu-Spam-Score: -6.15
X-Migadu-Scanner: mx0.migadu.com
X-TUID: cYH3j3qZboM3

* 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
-- 
2.41.0