From patchwork Thu Sep 29 13:53:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 43047 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 23D9527BBEA; Thu, 29 Sep 2022 16:12:04 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 BBFC927BBE9 for ; Thu, 29 Sep 2022 16:12:03 +0100 (BST) Received: from localhost ([::1]:35300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odvCk-0001ha-Sl for patchwork@mira.cbaines.net; Thu, 29 Sep 2022 11:12:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odu0F-0004ph-7x for guix-patches@gnu.org; Thu, 29 Sep 2022 09:55:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odu0E-0007Ut-G2 for guix-patches@gnu.org; Thu, 29 Sep 2022 09:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1odu0E-0005Yj-7h for guix-patches@gnu.org; Thu, 29 Sep 2022 09:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58054] [PATCH v2 1/2] gnu: qtwayland: Rename to qtwayland-5. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Sep 2022 13:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58054 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58054@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 58054-submit@debbugs.gnu.org id=B58054.166445964921286 (code B ref 58054); Thu, 29 Sep 2022 13:55:02 +0000 Received: (at 58054) by debbugs.gnu.org; 29 Sep 2022 13:54:09 +0000 Received: from localhost ([127.0.0.1]:36702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odtzM-0005XE-VU for submit@debbugs.gnu.org; Thu, 29 Sep 2022 09:54:09 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odtzJ-0005Wk-Nk for 58054@debbugs.gnu.org; Thu, 29 Sep 2022 09:54:07 -0400 Date: Thu, 29 Sep 2022 21:53:35 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664459638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zZMDAhxg4i3v6h8xIPJpUkuS+kTo/ypCQxIG+V5VpMY=; b=k1wAV3ROLVl1UObO9J+/I7q6kiPIhW98vVee+OkjVimF2kPNUtZ0AXB2OY4HEZNti2ExpQ AYMr4NRHR+I2HnJaVA7tSITi9VzJCxVi9Z2cvyp5st3pBN+Fh5CqfPyUp2vVJxa+xwsea+ aOycC0eefNPVf+5xVrKp+847pHEdevCc57w09pzcpDupUoZuYPVxoVzaSf7eV2S9oI1Pyu BZZnRSkFOLg9XWwBIJYWh6TZkAwXcEeE2htt6Ub3iQAxu7kxvfMHlus3noMRScxpI6vBG1 ROO2O5d+t+s63ALCiKaMcrIdXUw7nn6lw1oWmZel9BuIcFHmk8UhsTathDrlHQ== Message-ID: In-Reply-To: References: <87zgejtjf5.fsf_-_@gmail.com> MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches Automated via: git grep -l qtwayland | xargs sed 's/\qtwayland\b/\0-5/g' -i git checkout NEWS --- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 61cbf19bc4..059667ee5d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1068,7 +1068,7 @@ (define-public kwayland (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland wayland wayland-protocols)) + (list qtbase-5 qtwayland-5 wayland wayland-protocols)) (arguments `(#:tests? #f ; FIXME tests require weston to run ; weston requires wayland flags in mesa diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 39716187fd..064f5f7278 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -177,7 +177,7 @@ (define-public layer-shell-qt (list libxkbcommon qtbase-5 qtdeclarative-5 - qtwayland + qtwayland-5 wayland wayland-protocols)) (home-page "https://invent.kde.org/plasma/layer-shell-qt") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8c94d613d6..f6e5a37472 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -220,7 +220,7 @@ (define-public materialdecoration (list cmake-shared extra-cmake-modules pkg-config)) (inputs `(("qtbase" ,qtbase-5) - ("qtwayland" ,qtwayland) + ("qtwayland" ,qtwayland-5) ("wayland" ,wayland) ("xkbcommon" ,libxkbcommon))) (synopsis "Material Decoration for Qt") @@ -1450,7 +1450,7 @@ (define-public qtmultimedia set of plugins for interacting with pulseaudio and GStreamer.") (license (package-license qtbase)))) -(define-public qtwayland +(define-public qtwayland-5 (package (inherit qtsvg-5) (name "qtwayland") (version "5.15.2") diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 2df68ccca7..82c9227ba8 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -502,7 +502,7 @@ (define-public telegram-desktop qtbase-5 qtimageformats qtsvg-5 - qtwayland + qtwayland-5 range-v3 rlottie-for-telegram-desktop rnnoise diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 01c9ae186a..ca6148b078 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3385,7 +3385,7 @@ (define-public obs qtbase-5 qtsvg-5 qtx11extras - qtwayland + qtwayland-5 speexdsp v4l-utils wayland From patchwork Thu Sep 29 13:53:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 43050 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 74D7D27BBEA; Thu, 29 Sep 2022 16:46:35 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 301BB27BBE9 for ; Thu, 29 Sep 2022 16:46:35 +0100 (BST) Received: from localhost ([::1]:49226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odvkA-0004xV-AW for patchwork@mira.cbaines.net; Thu, 29 Sep 2022 11:46:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odu0F-0004pg-75 for guix-patches@gnu.org; Thu, 29 Sep 2022 09:55:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odu0E-0007Uu-Pu for guix-patches@gnu.org; Thu, 29 Sep 2022 09:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1odu0E-0005Z9-ME for guix-patches@gnu.org; Thu, 29 Sep 2022 09:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58054] [PATCH v2 2/2] gnu: Add qtwayland, version 6.3.1. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Sep 2022 13:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58054 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58054@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 58054-submit@debbugs.gnu.org id=B58054.166445967221322 (code B ref 58054); Thu, 29 Sep 2022 13:55:02 +0000 Received: (at 58054) by debbugs.gnu.org; 29 Sep 2022 13:54:32 +0000 Received: from localhost ([127.0.0.1]:36705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odtzh-0005Xn-CS for submit@debbugs.gnu.org; Thu, 29 Sep 2022 09:54:32 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odtzf-0005Xa-CT for 58054@debbugs.gnu.org; Thu, 29 Sep 2022 09:54:27 -0400 Date: Thu, 29 Sep 2022 21:53:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664459660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nozVq+ntpeeA1We4OPYDrTTxYgrWpH1Z3SK88hrsCyg=; b=c6qjRFryNL/onyt2ToXo9cb2ZqByoABEU1nHGBvH5PpTxfNnn43+dTB7vfNEXwe8Mh2sMY EP8F4GeTisCn+rSDevWCtOpyTD5nvtz97VVTOodLul0L34uzNTP6j+FlVKnehQxDMISLUk KxxDMDpEfEiCmsoSHODqAqDuHWqXC+1xWEdVUSmmFTEUVsoulxVDHiUi+AEZKNw5gWI+uk 2jJXaBfz90gP0LIGHYvSj/4oQ0BkqRdkba5msLLB6/Y6iU6vwC7kQlqjTgryCF+5UEcnK3 rFKMTHkno03WKsdMvWIOV3SmhpTGInMcLtwJq9ybZoHOYrJawAlBkxD8b2x5jQ== Message-ID: In-Reply-To: References: <87zgejtjf5.fsf_-_@gmail.com> MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qtwayland): New variable. --- gnu/packages/qt.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f6e5a37472..6e30980505 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1500,6 +1500,56 @@ (define-public qtwayland-5 (description "The Qt Wayland module provides the QtWayland client and compositor libraries."))) +(define-public qtwayland + (package + (name "qtwayland") + (version "6.3.1") + (source + (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; FIXME: tst_seatv4::animatedCursor() fails here. + ;; See also: + (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp" + (((string-append + "QVERIFY\\(!cursorSurface\\(\\)->" + "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "") + (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") "")))) + (add-before 'check 'set-test-environment + (lambda _ + ;; Do not fail just because /etc/machine-id is missing. + (setenv "DBUS_FATAL_WARNINGS" "0") + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (native-inputs (list glib perl pkg-config qtdeclarative)) + (inputs + (list fontconfig + freetype + libx11 + libxcomposite + libxext + libxkbcommon + libxrender + mesa + mtdev + qtbase + vulkan-headers + wayland)) + (synopsis "Qt Wayland module") + (description "The Qt Wayland module provides the QtWayland client and +compositor libraries.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtserialport (package (inherit qtsvg-5) (name "qtserialport")