From patchwork Sun Sep 8 17:30:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67772 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 5972B27BBEA; Sun, 8 Sep 2024 18:31:27 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 17B7A27BBE2 for ; Sun, 8 Sep 2024 18:31:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snLkb-0002w4-CO; Sun, 08 Sep 2024 13:31:01 -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 1snLkZ-0002vZ-VQ for guix-patches@gnu.org; Sun, 08 Sep 2024 13:30:59 -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 ) id 1snLkZ-0005rX-M0 for guix-patches@gnu.org; Sun, 08 Sep 2024 13:30:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=5nMZvnOrhQC4qvKDkEIZiwGuGL++PQEljF7SExadx9w=; b=GxLC24ztAVEQRldavae2MS4qqwJAbj/KyvW4EPftYAz9RBrouDVBkhBt5dtefWijsGCxqqGVD+oOfQqcu25VWceZYHEMZ0cmlLh3Lgn/8QBJgRS7O9BdlS7jv8J8N688UnaDRqs+op/hRsE7nOwCTaxECoL/mlPuHVvCdmBJc8Tot5B2u4UIhBhfEDatXVNvvhFW2pg5JoGUynywlGOHtAkxZ9AU08oa/liEZxMMaw8UQ1LxYuauesPcJGreKJT2plrutfGC7xEzlCFIWaBCmYC41BucCeh3ib68MLMWyn7BSJttQwuEXRnCR+4CSjlloZW8zq3/CfYzsbCdxiBVLQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snLkc-0000vv-2l for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH 1/3] gnu: wayland: Update to 1.23.1 Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 17:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73124@debbugs.gnu.org Cc: John Kehayias , Rutherther Received: via spool by 73124-submit@debbugs.gnu.org id=B73124.17258166233509 (code B ref 73124); Sun, 08 Sep 2024 17:31:02 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 17:30:23 +0000 Received: from localhost ([127.0.0.1]:59985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLjz-0000uW-D4 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:23 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:60291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLjx-0000uG-75 for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725816612; x=1726075812; bh=5nMZvnOrhQC4qvKDkEIZiwGuGL++PQEljF7SExadx9w=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=cA72k0ckAfXVStHaWX/JLR6nZh9FMHjTqRGjqGAXW1/tu7lveXzQAC0v+BZaXQ7SR YFcguI21ScKoUOAiUfZK5lsxKX7j5wC8+YsY5HhblTd37NgawVVIID3ENUeFItQ4K2 w4xJSw+MRzcC+EffMG6wD/NAAnvOOjGTGcCE3xFYWhZWSMx0/sBsTxfvk+92e6PESj tdn0Uoj5+Psq1OvH3WTVqjnNmCfTtcMqEKPK1bnP2Ilo0MsSRkA3jRT76TfRFVLAI0 Z2jBS2XL4c/Uf8SyQG6QiLB45sIs7rTFunPksaW9u5sAult/30YWt7HZD/pT6TFfQm lmEaPSX2qntoQ== Date: Sun, 08 Sep 2024 17:30:06 +0000 Message-ID: <87da81cfda4ce0a8570978d3975ec370c3a595c1.1725815893.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 44647f39e8e5ba039017e3943f87789ddb70e611 MIME-Version: 1.0 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: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther 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 Change-Id: I8430fd2c5f970e11c86ea3e4c1a4f066e9bf524e --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d5b31bf837..89509e7a1c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1316,7 +1316,7 @@ (define-public python-pyxdg (define-public wayland (package (name "wayland") - (version "1.22.0") + (version "1.23.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.freedesktop.org/" name @@ -1324,7 +1324,7 @@ (define-public wayland name "-" version ".tar.xz")) (sha256 (base32 - "0hjq8b1cprxpxcv2klgir1hd63vy5hrqilp9v317394qlqgayh0m")))) + "1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments From patchwork Sun Sep 8 17:30:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67770 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 88B1627BBEA; Sun, 8 Sep 2024 18:31:16 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 EB4A427BBE2 for ; Sun, 8 Sep 2024 18:31:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snLkc-0002wQ-Jp; Sun, 08 Sep 2024 13:31:02 -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 1snLka-0002vi-EZ for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:01 -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 ) id 1snLka-0005rd-4d for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=/4xIv4iPNKP1MeETM/1ZMrZz7VCCNhAs99kNAW5ATA4=; b=RGm6i33zuJui7wyGgfxWGilzEQ2dUqHXA7S7jGxNaJzWMNKZC7iH5HnAV5A1X7GIofoAIXGfTmwOSj9qujNYsJNg//QLGzQxW6h/JjhiGgdKBrS8rqVZfhvLE3VkeQpCL2tpEnUL4oMcjBkcbA0XIQQtZo+DDMcsfpCR1BbGw0mzewD4+xVybZ32acbOc65DvibG+nJznlVEGbTCu81r2dOqvmkybFbLCWqbfB4o9vzDMWVt9tLa2UOYZ1cXBE+GirZPabx0JNVppgS9kAPfulF+1yuC+YPACQzzbBBVWnebgx7Wamgeem65OFsfDrqueh+TK6G9QkFF8vgTcwNmdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snLkc-0000w2-HQ for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH 2/3] gnu: wlroots: add 0.18 Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 17:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73124@debbugs.gnu.org Cc: John Kehayias , Rutherther Received: via spool by 73124-submit@debbugs.gnu.org id=B73124.17258166273525 (code B ref 73124); Sun, 08 Sep 2024 17:31:02 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 17:30:27 +0000 Received: from localhost ([127.0.0.1]:59989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLk2-0000ul-Oa for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:27 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:37563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLk0-0000uL-PH for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725816616; x=1726075816; bh=/4xIv4iPNKP1MeETM/1ZMrZz7VCCNhAs99kNAW5ATA4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=kjLPV5S86ev7vLLYzHN+6RuE4o6qaWceWDGNB3y6M9jkoO8yYGnSB7mQ38ULUElir s7R4GtJFRH7I9UP/zpFFwwYzYppuHtkdAPGYhSqTnfuXu2O73NoS01oBAiBvQVHtZW y7jhdTrPHW02AKf2EvftJa+alGhF0wtWZm/RAO1/vBohLh8DlI+iKxuTlXkGrSAr65 tSiF/07BT3H1fGY4tzR7e9nKg5SseBYIgCFE5X474aOfm3BjVCLx7jzymUCsF671/O 1JipIJWWv28KVZmZXjdYkkTXK3HETyrb++QT1CwuE6kemhQ/VxCmgbbtat5NyMn6OR 9sdSfAQ5elpvA== Date: Sun, 08 Sep 2024 17:30:13 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 21e4e089fa7ba266211c7de60d1863834fec8233 MIME-Version: 1.0 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: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther 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 wlroots major versions are usually incompatible. With change to 0.18 wlroots has a different .pc pkg-config file name, wlroots-0.18.pc. That means any package using pkg-config to search for wlroots won't be able to find it. So even if there were no breaking changes inside wlroots code base, it means programs cannot be compiled against different major version. I've thus exposed every wlroots as a separate symbol without the need for use of "wlroots" symbol, so every package can use major wlroots version appropriate for its version. I've kept wlroots symbol to not break anything that is currently using it for wlroots-0.17. Change-Id: Id7983e872e91543cbfc2b585f3723fa9b287309f --- gnu/packages/wm.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d7ac3498f..238f4138ab 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1723,10 +1723,10 @@ (define-public polybar functionality to display information about the most commonly used services.") (license license:expat))) -(define-public wlroots +(define-public wlroots-0.18 (package (name "wlroots") - (version "0.17.4") + (version "0.18.0") (source (origin (method git-fetch) @@ -1735,9 +1735,8 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")) - ;; This patch can be removed once hwdata in Guix supports pkg-config - (patches (search-patches "wlroots-hwdata-fallback.patch")))) + (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")) + (patches (search-patches "wlroots-hwdata-fallback.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -1784,9 +1783,25 @@ (define-public wlroots modules for building a Wayland compositor.") (license license:expat))) ; MIT license +(define-public wlroots-0.17 + (package + (inherit wlroots-0.18) + (name "wlroots") + (version "0.17.4") + (source + (origin + (inherit (package-source wlroots-0.18)) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/wlroots/wlroots") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")))))) + (define-public wlroots-0.16 (package - (inherit wlroots) + (inherit wlroots-0.18) (name "wlroots-0.16") (version "0.16.2") (source @@ -1803,7 +1818,7 @@ (define-public wlroots-0.16 (define-public wlroots-0.15 (package - (inherit wlroots) + (inherit wlroots-0.18) (name "wlroots-0.15") (version "0.15.1") (source @@ -1816,6 +1831,8 @@ (define-public wlroots-0.15 (sha256 (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h")))))) +(define-public wlroots wlroots-0.17) + (define-public wl-mirror (package (name "wl-mirror") From patchwork Sun Sep 8 17:30:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67771 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 677B327BBEA; Sun, 8 Sep 2024 18:31:24 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 D30FB27BBE2 for ; Sun, 8 Sep 2024 18:31:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snLkc-0002wN-Aa; Sun, 08 Sep 2024 13:31:02 -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 1snLkb-0002vq-2y for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:01 -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 ) id 1snLka-0005ri-Lr for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=jevIJ1ngxPmu2jeWtsMIVPt3wpYm4b10P3D7V6KFE/4=; b=JSyZgc9HP+V0z5mJTp09pcH75FsN9V+xWj/6fCy0SxnldJ3/20aoPckK/oR1McPyxJ9t5n4WYbpvrBzWd0euay+3AeOAT49XgLn+GXGGuAQUBZqCDwAcH1F5JcTsma+Lfw87XcOgij8be9dW9uHjcR/Vjjb0a4ZoBngnHoa6ntsEm5zmWq1L3uOMhwxBe+bGKdOS/eSTVxC1GqbgxlhFmVFBCu7Ls91PUGF+kq4+n0nmBtR77WmEYlcI8DTvdiMI6z0LNLuJw95sfD8742oYfzYSK2akVVIjkUdtID+psHjGyiOtOsVVCz33EzqM8LxpPPlTs0sXjnkVVV9f6b+yQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snLkd-0000wA-28 for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH 3/3] gnu: wlroots: Remove hwdata patch Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 17:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73124@debbugs.gnu.org Cc: John Kehayias , Rutherther Received: via spool by 73124-submit@debbugs.gnu.org id=B73124.17258166393555 (code B ref 73124); Sun, 08 Sep 2024 17:31:03 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 17:30:39 +0000 Received: from localhost ([127.0.0.1]:59993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLkF-0000vF-CP for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:39 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:61089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLkD-0000v0-An for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725816627; x=1726075827; bh=jevIJ1ngxPmu2jeWtsMIVPt3wpYm4b10P3D7V6KFE/4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=rgQJ+VVuYbKvsz87rVvcS9BTpkIeEWH0XWJRNV1j57KmABIFyEX4TvIqt3WcEkK6/ JOLtD3hUo4rxZH1nP9zezYANshNimRZKtmdp0f5rYuu320bSr9mu+xdoixPa4s/l/m N9PO4ibQW3aN5XhiKd7dlUULeEdwgMt6H8RXgf993v04MooROuqDIoL0Q0Z+jEW1S2 FhZEtb77A+RKVLzSQaRKR4+3u6jna5WC1r8eQVb3xQrgwN/GzarGH1ufFHXH2tT5IZ hjtWf706ZvUHbNzpBV74MMgMFo8ZsH8/o2D+BS6l3xCB4R1GpMPYxxBN8Ht3YhstjH rDsnMIEBVGfXg== Date: Sun, 08 Sep 2024 17:30:21 +0000 Message-ID: <8259a901ab9814e5614b47eda2ccec3fd2577d12.1725815893.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 46ade36010f5f5104837624b49fde46d3ee02c68 MIME-Version: 1.0 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: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther 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 Hwdata has been updated and outputs "share/pkgconfig/hwdata.pc", this patch is no longer necessary. Change-Id: Ie4c8cd26fa5c1162004f096f037c658b103b02ae --- gnu/local.mk | 1 - .../patches/wlroots-hwdata-fallback.patch | 46 ------------------- gnu/packages/wm.scm | 4 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf42e2b6da..4a2b1c1dbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2288,7 +2288,6 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ - %D%/packages/patches/wlroots-hwdata-fallback.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch deleted file mode 100644 index 6468c7cbf3..0000000000 --- a/gnu/packages/patches/wlroots-hwdata-fallback.patch +++ /dev/null @@ -1,46 +0,0 @@ -backend/drm: add hardcoded hwdata path fallback - -Add hardcoded fallback "/usr/share/hwdata/pnp.ids" as a -temporary solution to get things working in Guix until -hwdata ships with pkg-config file. - -diff --git a/backend/drm/meson.build b/backend/drm/meson.build -index 6fcb2c15..ed95360a 100644 ---- a/backend/drm/meson.build -+++ b/backend/drm/meson.build -@@ -1,8 +1,7 @@ - hwdata = dependency( - 'hwdata', -- required: 'drm' in backends, -+ required: false, - native: true, -- not_found_message: 'Required for the DRM backend.', - ) - - libdisplay_info = dependency( -@@ -19,15 +18,21 @@ libliftoff = dependency( - required: false, - ) - --if not (hwdata.found() and libdisplay_info.found() and features['session']) -+if hwdata.found() -+ hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') -+ pnp_ids = files(hwdata_dir / 'pnp.ids') -+else -+ pnp_ids = files('/usr/share/hwdata/pnp.ids') -+endif -+ -+if not (libdisplay_info.found() and features['session']) - subdir_done() - endif - --hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') - pnpids_c = custom_target( - 'pnpids.c', - output: 'pnpids.c', -- input: files(hwdata_dir / 'pnp.ids'), -+ input: pnp_ids, - feed: true, - capture: true, - command: files('gen_pnpids.sh'), - diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 238f4138ab..ed998101e7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1735,8 +1735,7 @@ (define-public wlroots-0.18 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")) - (patches (search-patches "wlroots-hwdata-fallback.patch")))) + (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")))) (build-system meson-build-system) (arguments `(#:phases @@ -1790,7 +1789,6 @@ (define-public wlroots-0.17 (version "0.17.4") (source (origin - (inherit (package-source wlroots-0.18)) (method git-fetch) (uri (git-reference (url "https://gitlab.freedesktop.org/wlroots/wlroots")