From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UHYJEgOaNGPIUAEAbAwnHQ (envelope-from ) for ; Wed, 28 Sep 2022 21:01:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WG8DEgOaNGMogQEA9RJhRA (envelope-from ) for ; Wed, 28 Sep 2022 21:01:23 +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 D6F41F4C6 for ; Wed, 28 Sep 2022 21:01:22 +0200 (CEST) Received: from localhost ([::1]:52004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odcJ7-0000cS-SR for larch@yhetil.org; Wed, 28 Sep 2022 15:01:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odcHr-0000ap-DE for guix-patches@gnu.org; Wed, 28 Sep 2022 15:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odcHr-0008Jn-3s for guix-patches@gnu.org; Wed, 28 Sep 2022 15:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1odcHq-0002So-Tu for guix-patches@gnu.org; Wed, 28 Sep 2022 15:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58054] [PATCH 0/2] gnu: Add qtwayland, version 6.3.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Sep 2022 19:00: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: Hilton Chain Cc: 58054@debbugs.gnu.org Received: via spool by 58054-submit@debbugs.gnu.org id=B58054.16643915459366 (code B ref 58054); Wed, 28 Sep 2022 19:00:02 +0000 Received: (at 58054) by debbugs.gnu.org; 28 Sep 2022 18:59:05 +0000 Received: from localhost ([127.0.0.1]:34678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odcGv-0002Qz-2x for submit@debbugs.gnu.org; Wed, 28 Sep 2022 14:59:05 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:37538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1odcGs-0002QV-9i for 58054@debbugs.gnu.org; Wed, 28 Sep 2022 14:59:04 -0400 Received: by mail-qt1-f176.google.com with SMTP id j10so8539370qtv.4 for <58054@debbugs.gnu.org>; Wed, 28 Sep 2022 11:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date; bh=54/pmOL7HKRSS1ah21ccUQk+4XGmr+TvBXVCAFGzh8k=; b=bLtEznecEkyjYwNuuZsDEU0ouk/QMMGYPMVQm8ehNwcL3V3xAAojqwUGdw3tEEbJo9 bK2B4cTugg12wGk7uWoaevsSFjUjqGObsfjvLmEMFx2HSKc2it4eXYM675MlQ/c3gqIe wuFACJDDaStnFhtBw6PrXMKxtAPa91aC7cRp3w6kZcFBmxsAC6JCu/3fS24dpoM9Zk7n wvGFqau2HNYPxu2JWKr+Y7aM2EGegFD09IJB66mMf+LmFqw4bEFsX4vGEovttHZmmZy4 8vkyeeHmuDz1eQTd2Xq0LZkvBirdt5Qj/SoGZRudKlEmRdLgu/8kXEb9IUrRGer7uzVr z9IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date; bh=54/pmOL7HKRSS1ah21ccUQk+4XGmr+TvBXVCAFGzh8k=; b=vgyYiY8DC/FOnyX1/cYviK7OgjYyMt+emZbsaVeDdeF0ELvSKJ+pE+MZiG4y9cMP1I xQNIrkcEXKYaITxHImt2mNgDP2TzVi5029TzGaffxTmY2791PHgmnhVNExF8mjaYRbAt +mvQAzdCbw9qAqzMC+vGbJAH6W5yhd7+iYFtHLGrj1MekJuo90wXnNobekyc1I4U5wGX oo9gLjy8uEVb/q1BrLA/F3u3Y816Dpj4LFIU0F8sBVX9Fqdk2WpNlD2OB7FLAVCGISYk O+bpDaRm6CJgqLqXTHAXby/b2ahxuNhlvM8dV+UH15wFKmJkoyD4DTVRwFc+Jg+4LpKR bmCg== X-Gm-Message-State: ACrzQf3UYbzmaZ6dM4X5W2GIIiRHjwULJoUFgfPBNscvhs2nMyOFRfXz VUISM3Druladx51r1YQP++TIgvlyMFhSEw== X-Google-Smtp-Source: AMsMyM4UHnm7NeVSsGc6ZPFA9nL0MmPnST7dAvaXNVjdgtql0SclhqNYzX5hl3z86KNgoJvtoLLclQ== X-Received: by 2002:ac8:5f91:0:b0:35c:bfaa:5156 with SMTP id j17-20020ac85f91000000b0035cbfaa5156mr28521247qta.40.1664391536332; Wed, 28 Sep 2022 11:58:56 -0700 (PDT) Received: from hurd (dsl-148-95.b2b2c.ca. [66.158.148.95]) by smtp.gmail.com with ESMTPSA id ey18-20020a05622a4c1200b0031f36cd1958sm3579729qtb.81.2022.09.28.11.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 11:58:55 -0700 (PDT) From: Maxim Cournoyer References: Date: Wed, 28 Sep 2022 14:58:54 -0400 In-Reply-To: (Hilton Chain's message of "Sun, 25 Sep 2022 08:35:17 +0800") Message-ID: <87zgejtjf5.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1664391683; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=54/pmOL7HKRSS1ah21ccUQk+4XGmr+TvBXVCAFGzh8k=; b=FrO0bjkUxtAa3lTiGlO505RKRisxNDWPjlY5xEfvZ2FMrSwhiDqIPohBNgo8EZOD9hgKwI YaiGJlGo5J0NXKGqWvpmmnfmoecqic2h+wZL0A+b3M6zrB/PCkq+0IwvyII4k6MRNY5No3 zW/l8RKj7/DvlCJm0YTvIexNQ/2Z2R5G7Z41xrS7hAUcX+wfH41yYH4utbNK1pnCZddEen n7CbplF6EjE7KW1XkiIOOSG7lmeAQ4t1nXpfsXsn72xayRfkevmi5Kg4844YaTxMhe2MFE uQGMUEAOjpLWtP9nsjC1aEPfvxOVXEOjjwCjVBLQ7f1jJZ4gJb8HNFMC+7j7Ow== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1664391683; a=rsa-sha256; cv=none; b=RGBc+L36s8QKUGRiNfBqtVU/RMmeFUlBTLQZWhnxwsxTTZYPfYxoL8zL5um4fzVShi/hSt hN7z2NGd3K0NlQWqz0pG2jCJukFXiR/Ii+qLHY6EqZZ8EXXh8lfi0VYqr6+GMbc4sJwqjR aFuZ723zWWU76360fdGqy1Xd9wv+Nq9O2Bxatrz2wNOJKJol/LJ5iWOC+BP39y9wQAH/qZ dZ6ajZxgrXD9L3I1wKZohgUiI+H4D7HEaGHaGXZlHd86q0KMSwKV/mvflsYCRudELEWQ1f hkqbg2IqV4Dk6rNEqnau7lTWUS7bQzTT8wMyKcE/6l9CcjdxfaX4wy49fCKWlQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=bLtEznec; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Spam-Score: 5.05 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=bLtEznec; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Queue-Id: D6F41F4C6 X-Spam-Score: 5.05 X-Migadu-Scanner: scn0.migadu.com X-TUID: pnkT7iNVKZdh Hello Hilton! Hilton Chain writes: > * gnu/packages/qt.scm (qtwayland): New variable. > --- > gnu/packages/qt.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) Great work! > 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) For the qt 6 packages, I tried to not inherit from qtsvg, as while that can shorten some repetition sometimes, it doesn't really make sense (qtwayland is not related to qtsvg) and could cause problems down the line. > + (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. Please link to the upstream issue, already reported at https://bugreports.qt.io/browse/QTBUG-78317?jql=text%20~%20%22animatedCursor%22. > + (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))))) That's unwanted inherited stuff from qtsvg which should be no longer necessary after removing the inheritance. > + (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."))) > + Please send a v2 version with the above addressed and it should be good to merge it! Thank you, Maxim