From patchwork Sun Sep 25 00:34:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42919 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 C71EB27BBEA; Sun, 25 Sep 2022 01:36:41 +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 E009C27BBE9 for ; Sun, 25 Sep 2022 01:36:40 +0100 (BST) Received: from localhost ([::1]:50382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocFdQ-0007hP-3N for patchwork@mira.cbaines.net; Sat, 24 Sep 2022 20:36:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocFco-0007h3-Rs for guix-patches@gnu.org; Sat, 24 Sep 2022 20:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocFco-0002pm-GP for guix-patches@gnu.org; Sat, 24 Sep 2022 20:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocFco-0007td-5E for guix-patches@gnu.org; Sat, 24 Sep 2022 20:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58054] [PATCH 1/2] gnu: qtwayland: Rename to qtwayland-5. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Sep 2022 00:36: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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166406611430279 (code B ref -1); Sun, 25 Sep 2022 00:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2022 00:35:14 +0000 Received: from localhost ([127.0.0.1]:45533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocFc1-0007sI-TT for submit@debbugs.gnu.org; Sat, 24 Sep 2022 20:35:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:53734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocFbz-0007s8-U4 for submit@debbugs.gnu.org; Sat, 24 Sep 2022 20:35:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocFbz-0007ZU-P4 for guix-patches@gnu.org; Sat, 24 Sep 2022 20:35:11 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocFby-0002cH-19 for guix-patches@gnu.org; Sat, 24 Sep 2022 20:35:11 -0400 Date: Sun, 25 Sep 2022 08:34:50 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664066107; 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=e0f2+dd0qT5bE0oiqwRTcwEZPIM9PWnqQB80hCr+LvU=; b=nUzqXsAxpXqxWwkWkBfaui0Xm0bUq7yzNQuEYpQJF8kJL3VaMvRBmbkZ9H+zjZI7Eiejfh uCiMM11YNU2t7n7nwCZzrog+Ohbm8lNiU6YctCZIxTY8t1Az8X0d/S7a4B0x1hUzW5JWk/ mUH5d/aanHfAr7zsrud7FPz7yJVBKlQ6hKVWOIS79wqSzcMUfAEMLUZp4SKWkMdxN3Dy95 D4HeT9Ss3aJCNn2QWW9uumm0GS4Z4MJ81E0OHlsYDHe9yqLb5EDWd2DDBy4tAFsxnDh4md 9sTro6zgaYMAP7KrHtnPP9bMbE5plmAPerrJKuwr0omSTAHp7D2jaNReuvM1nA== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 738013fdba..62de3e38ad 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1077,7 +1077,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 cb7f72e698..bf978eec50 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 6c9869f93e..10061059f6 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -588,7 +588,7 @@ (define-public telegram-desktop qtsvg-5 qt5ct qtimageformats - qtwayland + qtwayland-5 range-v3 rlottie-for-telegram-desktop rnnoise diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f07fe192ed..98e2f38148 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 Sun Sep 25 00:35:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42918 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 7F85827BBED; Sun, 25 Sep 2022 01:36:41 +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 0717427BBEA for ; Sun, 25 Sep 2022 01:36:41 +0100 (BST) Received: from localhost ([::1]:50384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocFdQ-0007hd-6J for patchwork@mira.cbaines.net; Sat, 24 Sep 2022 20:36:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocFcq-0007h4-3Z for guix-patches@gnu.org; Sat, 24 Sep 2022 20:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocFco-0002ps-Q7 for guix-patches@gnu.org; Sat, 24 Sep 2022 20:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocFco-0007tl-Le for guix-patches@gnu.org; Sat, 24 Sep 2022 20:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58054] [PATCH 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: Sun, 25 Sep 2022 00:36: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 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166406613830319 (code B ref -1); Sun, 25 Sep 2022 00:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2022 00:35:38 +0000 Received: from localhost ([127.0.0.1]:45536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocFcQ-0007sw-E2 for submit@debbugs.gnu.org; Sat, 24 Sep 2022 20:35:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:54338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocFcP-0007sp-36 for submit@debbugs.gnu.org; Sat, 24 Sep 2022 20:35:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocFcO-0007fo-Ud for guix-patches@gnu.org; Sat, 24 Sep 2022 20:35:36 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:34574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocFcN-0002ok-FY for guix-patches@gnu.org; Sat, 24 Sep 2022 20:35:36 -0400 Date: Sun, 25 Sep 2022 08:35:17 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664066133; 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=Kl8L7KJUpSdLurzKdeW71tX0VE3Uj5YLZdTmbm//5rU=; b=dHEbWAA0vtSvjovn+jTUBgtsN6AIT1KtGXEME09pUGSCjaP9Q+OJeIlslbvPMJWJV1Uv03 Z5CnpYaIIRXNI6V9kRva6UI377bO7wzF5/Q4U0e0SaSHVR9ideSdI7S7JsAn9ER1XTe1a6 bEjVePLOMDYkx/bvI3MiEybBafGXiHmH5aSozuwGFyZ/NoXvxAlvvLAn55VrTKs+2obvUh /6fYMHFKkmYRC+RB8KEtqPGZndbzQ4k/S1/jlJWiOa/uxbu2bLqMP6epIKA3G2Na8iFmCW o3LYuy0lh73BMU0ROhc3PsZIxq3L7VFAC4/MgV0zlaxWh2NAtiQHHn18dtzZhQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index bf978eec50..25b246d7d4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1500,6 +1500,55 @@ (define-public qtwayland-5 (description "The Qt Wayland module provides the QtWayland client and compositor libraries."))) +(define-public qtwayland + (package (inherit qtsvg) + (name "qtwayland") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g")))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; FIXME: tst_seatv4::animatedCursor() fails for no good + ;; reason and breaks these two tests. + (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"))) + ;; No such directory anymore. + (delete 'delete-installed-tests))))) + (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."))) + (define-public qtserialport (package (inherit qtsvg-5) (name "qtserialport")