From patchwork Thu Apr 6 09:02:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 48995 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 D470E173FE; Thu, 6 Apr 2023 10:03:32 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 040D4173F7 for ; Thu, 6 Apr 2023 10:03:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkLWK-0004r6-I8; Thu, 06 Apr 2023 05:03:04 -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 1pkLWJ-0004qv-O2 for guix-patches@gnu.org; Thu, 06 Apr 2023 05:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkLWJ-00083I-Do for guix-patches@gnu.org; Thu, 06 Apr 2023 05:03:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pkLWJ-0005lR-8P for guix-patches@gnu.org; Thu, 06 Apr 2023 05:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61331] [PATCH 2/4] gnu: wlroots: Update to 0.16.1. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Apr 2023 09:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61331@debbugs.gnu.org Cc: Gabriel Wicki , Jonathan Brielmaier Received: via spool by 61331-submit@debbugs.gnu.org id=B61331.168077177122118 (code B ref 61331); Thu, 06 Apr 2023 09:03:03 +0000 Received: (at 61331) by debbugs.gnu.org; 6 Apr 2023 09:02:51 +0000 Received: from localhost ([127.0.0.1]:53390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkLW7-0005kg-3P for submit@debbugs.gnu.org; Thu, 06 Apr 2023 05:02:51 -0400 Received: from mout.web.de ([212.227.15.3]:60845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkLW3-0005jq-8n for 61331@debbugs.gnu.org; Thu, 06 Apr 2023 05:02:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1680771754; i=jonathan.brielmaier@web.de; bh=/ZNjb+xNd2MSf41jBL2IGEGtH2+nZz8JB64E94x2mfg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Tz7hbSUyBZjt/Ko2UdUZpXvd0N4typDSDCV+UIaTQU0TPlyGLeVoU6uDin3u/eXx2 jMvKeTs6b1zES9/GD3Fnb6FlqKBDYkHZ86Ra69rPdFu9+4WAybzW4qUjkEEw8Nx2hn KGyitoCEo/ywkGMaO++6iFBeXjRzKvMhPLppdInISnxKaHT2nAs75wCslZzL2qJMSF wI4eWipfRQhgxtUpz6Kz6RLWOLdljxStdlulEM2mUBJ6X4VI11XklUe3RaLCSAWGeU pX8A/aeuMCZYbTd8emj1TTYm5BjAxpm8CtTKNA5/TJlrk2Hq7ZqC46MRgpQ8Ey6ono VdZI4DfDvju4A== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.fritz.box ([77.190.24.128]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1Mkmvj-1q73np0UgB-00luIp; Thu, 06 Apr 2023 11:02:34 +0200 From: Jonathan Brielmaier Date: Thu, 6 Apr 2023 11:02:23 +0200 Message-Id: <20230406090225.31969-2-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406090225.31969-1-jonathan.brielmaier@web.de> References: <20230406090225.31969-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:4bctOykjqqUpwnC2mt7fFrZFGnYxr80E66dRLACR8bgFdtnE+EL MrorSQTF2GpE6zXwlUQK4PRssesu5ZQghmiU+wnftvb7m+0fVOGQclk6zCht6Y18Ry5cPIw dbk774f15/LKqc3jZTZ2wr56JhSDny+yxSWNPmkAAmUnjxBcIZrEPFbP2tFSmp0o+Oive3g VSx6v/YwXkAmSYvTKJwgQ== UI-OutboundReport: notjunk:1;M01:P0:krujmgoqNhE=;UsdwAiT/GoMm0uctCMY6Zlp/KS/ 9cjbxzYzRHES7nrwazu9bzR6c6c3ZpLo3s+agrmUQcwSDwCrzMB/wyMfH571ogs6hn52hzpqz uowAfFjW9bzANN1z774D/qDHhBUWUhUD/W6SmEKJsd0ux5o3FTqn05aGmQs7uv6Kmc9/TC7xz 44//8ABAE5MAGYYkGt25uKZsP9AmyVfVmYLwJ83s92DHDAwmAsREiwE7i/OttV23Vyk7SgJfd wwk1kI7KqZ5ayhWaIwirwlabWic6VY9CuoEIRP6ZuSHyL9plxN6ZDobE9UkvwMOEPLw903P9Y LLrt7Y/rKgcO2AkFc4euALpUBDR0m0y5o0Q3+9W0uTsMgBKWP2ozZB5qSnhz9i2JddOcwDlTU mq7PeXQfq3ya8NFCwdWpv5aIpQ1tBITKV5CmSxcg8/QL9n/Ng8YR3aP5jNc5omtK5Ba/UE7sn hIo2Ph8APCJTWJ4Np1W3n+uYkB3sjz/gIpbHm64S66V7tPmfeFErIgktAZcoSJmTnh607fbKP HYS2J8Od1mHY97ZmhyOuslik3EU/vzSvllP+/MYO0QPqcv2RknXtMSpreMRulLiCZbbLvtpoa BjxzqPm8l/S+vJPLJ1iiRMcTCBq6EJ8NjXGHIvwAhAB7QJeOw3s4Gp/H0Vq8Krn15/hrNYa8Y N88FNTWnJ83IIeeyotz4J1H2YHkKnvzTo1TFjoj99wk3QaQVCtnjFQYct1/eRkI9XhECpWqSQ 7HyBvX3LWMrngHflPj83249kiPrP+a9I0FLaXedBWZMXFRwJ6xs5zq7uHvsr57vMUgyF0Z9LO JqOt4tQ6nbWGaC/8giHCO/zIprfj3Rf3AkanXAfDtQWEMLTKSb4F23cXl6/fQG/PwcOtjHxtH IbFOC9637ONfd9Fseu87qQlLQTD+Wj5crD74Ol2jhM0ZOjAMOkWBQz8DZWiB3oXs4pRIntjBj 1mkrNpAOuZM41BO2/a2mUIEQyvg= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Gabriel Wicki * gnu/packages/wm.scm (wlroots): Update to 0.16.1. [arguments]: Add 'fix-meson-file phase to fix pnp.ids path. [native-inputs]: Add hwdata:pnp. Signed-off-by: Jonathan Brielmaier --- gnu/packages/wm.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) -- 2.39.2 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 985c1ac56b..2a5459e35a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -60,6 +60,8 @@ ;;; Copyright © 2022 Fredrik Salomonsson ;;; Copyright © 2022 ( ;;; Copyright © 2022 zamfofex +;;; Copyright © 2023 Gabriel Wicki +;;; Copyright © 2023 Jonathan Brielamier ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,6 +133,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages mpd) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -1539,7 +1542,7 @@ (define-public polybar (define-public wlroots (package (name "wlroots") - (version "0.15.1") + (version "0.16.1") (source (origin (method git-fetch) @@ -1548,7 +1551,7 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h")))) + (base32 "11kcica9waj1a1xgbi12gif9z5z0b4xzycbcgawbgdmj77pws8sk")))) (build-system meson-build-system) (arguments `(#:phases @@ -1559,7 +1562,13 @@ (define-public wlroots (("Xwayland") (string-append (assoc-ref inputs "xorg-server-xwayland") "/bin/Xwayland"))) - #t))))) + #t)) + (add-before 'configure 'fix-meson-file + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "backend/drm/meson.build" + (("/usr/share/hwdata/pnp.ids") + (string-append (assoc-ref inputs "hwdata") + "/share/hwdata/pnp.ids")))))))) (propagated-inputs (list ;; As required by wlroots.pc. eudev @@ -1574,7 +1583,9 @@ (define-public wlroots xcb-util-wm xorg-server-xwayland)) (native-inputs - (list pkg-config)) + (list + `(,hwdata "pnp") + pkg-config)) (home-page "https://github.com/swaywm/wlroots") (synopsis "Pluggable, composable, unopinionated modules for building a Wayland compositor")