From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH 0/3] Update labwc, wlroots, and shuffle some deps around Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 13:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by submit@debbugs.gnu.org id=B.170394282519680 (code B ref -1); Sat, 30 Dec 2023 13:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2023 13:27:05 +0000 Received: from localhost ([127.0.0.1]:43284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZMm-00057L-Ue for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:27:05 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZMi-00056o-QM for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:27:03 -0500 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 1rJZMb-0003Bg-0d for guix-patches@gnu.org; Sat, 30 Dec 2023 08:26:53 -0500 Received: from rainycloud.ext.redscript.org ([103.105.48.212]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJZMY-00064s-QU for guix-patches@gnu.org; Sat, 30 Dec 2023 08:26:52 -0500 Received: from localhost.localdomain (bba-2-51-3-250.alshamil.net.ae [2.51.3.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 197527BB; Sat, 30 Dec 2023 13:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1703942805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JMG//fWI3dxIiMfH/3dQrtE5VcDcWzjb38YXKtY7d1c=; b=c+ZjEu0F6xn6l4myVWI2/EGh+1jviKU7IyHESxySRiGT6IFbscJnZ+HrP7eFr4+rMVFcl7 ZzLdLog5NAMw+sYURgIhvv8yQpRnW5NTmckOq+97mjxhb7JUfIrXAfylKjEFz2KhD/tbci OEP+JRC0atH+AmyXZF9pGTs7LJ6npZ/JKICnZ8AQP1YeRK6MJXRuSgjBAfu+mvBUhodwim svI67Qraygxi6K06Fx5+wmyukJe2G9/WHANM0QZEV/qG5ZyNKOMZLUKh6jVOqKAX0DYxh4 e3Jst4ev7m0DwwD/I1QIej+O3YjJxtqIWJukRUnQ0ZfzQuoB08zUZysBXIsTUMll1EZpzZ stJDqes3AnELucSGiZ9DpKdU0/JHuzjKx1Uznz+qVrKqPnaoQtOAPeYtAEHom8ws5N7w/8 FDNB0o0qJ4g91k68ABPxETINjbKaZR52/YugprrrZ/FxWJbYL+dIgKXwGObknPvdOzkj/f d5bOmvKRMXhupvm/ugzhQru8tsEVjb5hqLqs//TWcYGdtVUbHQaVcJ5sbvmvlY3UmYSLrR QtRs2SsfkizWOeMsTpnUiSaCbYZbd8buz5oqyF+95ia38HTbOghXi0qr3vDPRtKWyVUnSi 974wE6cvFWVmg8cop3vCPXxAONaOfQCxh93YvFWFztGwGR27Gs6WE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1703942805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JMG//fWI3dxIiMfH/3dQrtE5VcDcWzjb38YXKtY7d1c=; b=u+DnW3mrKhOJObeGsRwx5JCLL6tWe5BA6Er+gPzQ8xnRrPn2ALfzlZHFiGQxAeErEdHE5G 0P5B7t6QW2v0MAAw== From: Ahmad Draidi Date: Sat, 30 Dec 2023 17:21:59 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.105.48.212; envelope-from=a.r.draidi@redscript.org; helo=rainycloud.ext.redscript.org 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) Hello Guix! The notable change in this patch series is that it updates wlroots to 0.17 since it's required by labwc 0.7, but also retains wlroots 0.16 as wlroots-0.16 and switches wlroots users to it, since they don't support 0.17 yet. Ahmad Draidi (3): gnu: Add libdisplay-info. gnu: Update wlroots to 0.17.1. gnu: labwc: Update to 0.7.0. gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 40 ++++++++++++++++ .../patches/wlroots-hwdata-fallback.patch | 46 +++++++++++++++++++ gnu/packages/wm.scm | 41 +++++++++++++---- gnu/packages/zig-xyz.scm | 2 +- 5 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch base-commit: 4d8b93e865ba71d2baa606d11529c3ecb5f14aea -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH 1/3] gnu: Add libdisplay-info. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 13:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68146-submit@debbugs.gnu.org id=B68146.170394304726712 (code B ref 68146); Sat, 30 Dec 2023 13:31:02 +0000 Received: (at 68146) by debbugs.gnu.org; 30 Dec 2023 13:30:47 +0000 Received: from localhost ([127.0.0.1]:43299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZQM-0006w5-C8 for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:30:46 -0500 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:33324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZQJ-0006fH-IA for 68146@debbugs.gnu.org; Sat, 30 Dec 2023 08:30:44 -0500 Received: from localhost.localdomain (bba-2-51-3-250.alshamil.net.ae [2.51.3.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 990F07BB; Sat, 30 Dec 2023 13:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1703943035; 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=FHZ6GEXqzwRo64zT6z1QBqWfuwFUblT32jvQk4c47aQ=; b=GjPbObM+ToS2yuO+eYZYDub1GCengi+1mSmcs3sQBljsD4CuPQ0K9N8HURnfWj/fjkubbj v+07L3vjktGDQv+qId/8EfWc0Qx7yt3/520Q7iZzOKeEtY2deKw7olUVbkBKds7DvvNQnG K5MHJahEvQJldksxpIOxXHZgwWhKetsXTjEqUTcsfdHh3P62nQUxnhZ4OmT9JRb6Cy573s l5JbDdHYrJfbGvS+kWztbk1TVVELj2ilg6MJDsB74LJIufJVTrQSprJwE59ebVfBg+6dax 2qgHHoDN95pPAV6YuCG3HmUHMNY94BuePI1+uhS1Golkg3BLvfO3Ljuo9lgZFAC2k+W5kD 8foq7Pixd1YHr7qLUw6mPXTYCxDBwKC55ksSszGKhRzDH+UegKLwVBfrGMKFaMaGZBd1NT wrJTbzFFnrFjqm8R6I8HQUIawnZ0cN7Li2Avh0hsF6YmFfW8+UOLtkXLM32jQGF9SEROJv PHHz3dxt46KbJ2/RwDDDnjQRs9ed5vm4RCJ+Llq7RKoEViSa8sUjOFprnkTXuPYIYgfqLl 7rpKulyrLMdHFvXgA0IM/3dJODbp/E8M3Ct4mhHiigCDrATYFnMDEO0Zc0us9YV6wRAiLr LUdnfw0f9/XS5sfVDpPfCqevOFO4REda5V0jj8s3R2+CsDKxwm5Nw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1703943035; 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=FHZ6GEXqzwRo64zT6z1QBqWfuwFUblT32jvQk4c47aQ=; b=Q59mcD+TM7wmvvehz7V/MAyQEYnJ2syHEMbfyHjJD7OKShfFjH3RxJPbiVpRGoObn9kppM sv+sd+IPPK0KF0BQ== From: Ahmad Draidi Date: Sat, 30 Dec 2023 17:28:46 +0400 Message-ID: <955298d0cd8d6fb1ade9984cfe2dde234d64f6c9.1703942286.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/freedesktop.scm (libdisplay-info): New variable. Change-Id: Id9d8a7c92f58a89310d52e62c335f932acb0adb3 --- gnu/packages/freedesktop.scm | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 648ebad408..9cf7804f10 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure +;;; Copyright © 2023 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,6 +98,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hardware) #:use-module (gnu packages hunspell) #:use-module (gnu packages ibus) #:use-module (gnu packages image) @@ -114,6 +116,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages python) @@ -2102,6 +2105,43 @@ (define-public colord-gtk that wish to perform colour calibration.") (license license:lgpl2.1+))) +(define-public libdisplay-info + ;; Latest commit passes tests while 0.1.1 doesn't + (let ((commit "ebee35935dad01478ae1ae5ead298c4cd8018ac2") + (revision "1")) + (package + (name "libdisplay-info") + (version (git-version "0.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/emersion/libdisplay-info") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ly8acdjxn8l55y0wc07n7pb6rzh9dpr1vbsakdib2zrl0i5yh3a")))) + (build-system meson-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-before 'configure 'fix-meson-file + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "meson.build" + (("/usr/share/hwdata/pnp.ids") + (string-append (assoc-ref (or native-inputs inputs) + "hwdata") + "/share/hwdata/pnp.ids")))))))) + (native-inputs (list edid-decode + `(,hwdata "pnp") pkg-config python-wrapper)) + (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info") + (synopsis "EDID and DisplayID library") + (description + "libdisplay-info is an EDID and DisplayID library that provides a set of + high-level, easy-to-use, opinionated functions as well as low-level functions +to access detailed information.") + (license license:expat)))) + (define-public libfprint (package (name "libfprint") -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH 2/3] gnu: Update wlroots to 0.17.1. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 13:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68146-submit@debbugs.gnu.org id=B68146.170394305127238 (code B ref 68146); Sat, 30 Dec 2023 13:31:02 +0000 Received: (at 68146) by debbugs.gnu.org; 30 Dec 2023 13:30:51 +0000 Received: from localhost ([127.0.0.1]:43303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZQQ-00073a-VH for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:30:51 -0500 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:43280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZQL-0006l3-1A for 68146@debbugs.gnu.org; Sat, 30 Dec 2023 08:30:45 -0500 Received: from localhost.localdomain (bba-2-51-3-250.alshamil.net.ae [2.51.3.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 1AD687F2; Sat, 30 Dec 2023 13:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1703943038; 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=DM8fd1D1kauZq/Z10H4RgWxgdri4rwpOiknK/Cifhos=; b=wn2GLVoySygHGwyjglmX3E12HGmunCjMGXL/h/yXKsV93L3AG0YZj5ljaiiMEOs06i/wb8 1aznGUC2qwp8rVRQYFQM+YRfLcKVmctwigF4KzJ+56u42OUfrVq2BoLav0hApwaTnKH97Z KSvHoRKxLpGVNvHwMAMywk/Sp84PLBfYebyX80JJNqr6nNbQAQZrHycoin4TURkkFAK2Mk Z9jQ3gANGbTMKTj4CaFXTMA3PSVW9kHCOrB3WWIvQvNEyZiKUEDxYfGvRJqdPXGBfnGrb2 qNYX3Bmn45ya03g99IKkSCWSUd4Ywui/4hY27ad4bj8S3qSzmBf7Db59eSlO19xhv13VL0 S/Rm3wRp5rPz+vesuWPpxXlVom0dtLNWD/scwXqLtdUWX93xLZMPdFO7GVmzCs80t+bwor bA7kPBrqRzTekJcFAZgCMsbu0EepmqNYqA5rrwlZehLpVmGjdKhlEKbWEWaItJCjhEs2rr papZRfXeSMGG6ERd/2IEqRqn98ZqCO1hqVvM5Ek/ByXOz/1zSdIYKvff9O0ZRR02vI8PWP n4XjsGkPQFsu1YGT3QxChVloHxZUuJAT8LBEUtNX+8rlS4TrlfHhDYGwp/w4rpcYdF5Wtj ayupCJLiHWXTHShnlTG/2tP0t8stPq01nV9YDiLNKr9DOKMEuEDvI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1703943038; 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=DM8fd1D1kauZq/Z10H4RgWxgdri4rwpOiknK/Cifhos=; b=EzslJYXmE9Stg2HJfktQ6VB+ngrF+oxY/4AmnjYvgMf+u+47mtAhZkQ3MslVNBXQUXTEzK Keb9P78IQ7J4sBAA== From: Ahmad Draidi Date: Sat, 30 Dec 2023 17:28:47 +0400 Message-ID: <4d7939be4ca5c4d293590e74578a5765a5cdac06.1703942286.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Also keep wlroots 0.16 since a few packages break without it. * gnu/packages/wm.scm (wlroots): Update to 0.17.1. [source]: Add patch. [propagated-inputs]: Add libdisplay-info. * gnu/packages/patches/wlroots-hwdata-fallback.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/wm.scm (wlroots-0.16): New variable. * gnu/packages/wm.scm (cage)[inputs]: Replace wlroots with wlroots-0.16. * gnu/packages/wm.scm (fnott)[inputs]: Likewise. * gnu/packages/wm.scm (dwl)[inputs]: Likewise. * gnu/packages/wm.scm (sway)[inputs]: Likewise. * gnu/packages/wm.scm (cagebreak)[inputs]: Likewise. * gnu/packages/wm.scm (hikari)[inputs]: Likewise. * gnu/packages/wm.scm (river)[native-inputs]: Likewise. Change-Id: Ib3d3938d6486fb1674380811a6dc0a512c991ac7 --- gnu/local.mk | 1 + .../patches/wlroots-hwdata-fallback.patch | 46 +++++++++++++++++++ gnu/packages/wm.scm | 37 +++++++++++---- gnu/packages/zig-xyz.scm | 2 +- 4 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2896395120..fe9577515d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2138,6 +2138,7 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-big-endian.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-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch new file mode 100644 index 0000000000..6468c7cbf3 --- /dev/null +++ b/gnu/packages/patches/wlroots-hwdata-fallback.patch @@ -0,0 +1,46 @@ +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 82ef67a2e4..8c228de1b5 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2023 Vessel Wave ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Jaeme Sifat +;;; Copyright © 2023 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -206,7 +207,7 @@ (define-public cage (sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) - (inputs (list wayland wlroots libxkbcommon)) + (inputs (list wayland wlroots-0.16 libxkbcommon)) (home-page "https://github.com/cage-kiosk/cage") (synopsis "Wayland kiosk") (description "This package provides a Wayland @dfn{kiosk}, which runs a @@ -1166,7 +1167,7 @@ (define-public fnott tllist scdoc)) (inputs - (list wlroots wayland fcft dbus libpng)) + (list wlroots-0.16 wayland fcft dbus libpng)) (home-page "https://codeberg.org/dnkl/fnott") (synopsis "Keyboard driven and lightweight Wayland notification daemon") (description "Fnott is a keyboard driven and lightweight notification daemon @@ -1568,7 +1569,7 @@ (define-public dwl (native-inputs (list pkg-config)) (inputs - (list wlroots)) + (list wlroots-0.16)) (home-page "https://github.com/djpohly/dwl") (synopsis "Dynamic window manager for Wayland") (description @@ -1674,7 +1675,7 @@ (define-public polybar (define-public wlroots (package (name "wlroots") - (version "0.16.2") + (version "0.17.1") (source (origin (method git-fetch) @@ -1683,7 +1684,9 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m12nv6avgnz626h3giqp6gcx44w1wq6z0jy780mx8z255ic7q15")))) + (base32 "1hj4gq5vx8in65622yvjm8bwqkw2vpc556k9my997a0hn0ricj37")) + ;; This patch can be removed once hwdata in Guix supports pkg-config + (patches (search-patches "wlroots-hwdata-fallback.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -1704,6 +1707,7 @@ (define-public wlroots (propagated-inputs (list ;; As required by wlroots.pc. eudev + libdisplay-info libinput-minimal libxkbcommon mesa @@ -1729,6 +1733,23 @@ (define-public wlroots modules for building a Wayland compositor.") (license license:expat))) ; MIT license +(define-public wlroots-0.16 + (package + (inherit wlroots) + (name "wlroots-0.16") + (version "0.16.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/wlroots/wlroots") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m12nv6avgnz626h3giqp6gcx44w1wq6z0jy780mx8z255ic7q15")))) + (propagated-inputs (modify-inputs (package-propagated-inputs wlroots) + (delete libdisplay-info))))) + (define-public sway (package (name "sway") @@ -1773,7 +1794,7 @@ (define-public sway pcre2 swaybg wayland - wlroots)) + wlroots-0.16)) (native-inputs (cons* linux-pam mesa pkg-config scdoc wayland-protocols (if (%current-target-system) @@ -2959,7 +2980,7 @@ (define-public cagebreak (("/etc/") (string-append #$output "/etc/")) (("/usr/share/") (string-append #$output "/usr/share/")))))))) (native-inputs (list pkg-config scdoc)) - (inputs (list libevdev pango wlroots)) + (inputs (list libevdev pango wlroots-0.16)) (home-page "https://github.com/project-repo/cagebreak") (synopsis "Tiling wayland compositor inspired by ratpoison") (description @@ -3056,7 +3077,7 @@ (define-public hikari linux-pam pango wayland - wlroots)) + wlroots-0.16)) (arguments `(#:tests? #f ; no tests #:make-flags diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 200b5c9940..75b60fcfa9 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -61,7 +61,7 @@ (define-public river scdoc wayland wayland-protocols - wlroots)) + wlroots-0.16)) (home-page "https://github.com/riverwm/river") (synopsis "Dynamic tiling Wayland compositor") (description -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH 3/3] gnu: labwc: Update to 0.7.0. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 13:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68146-submit@debbugs.gnu.org id=B68146.170394305227278 (code B ref 68146); Sat, 30 Dec 2023 13:31:03 +0000 Received: (at 68146) by debbugs.gnu.org; 30 Dec 2023 13:30:52 +0000 Received: from localhost ([127.0.0.1]:43305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZQR-00075G-P3 for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:30:52 -0500 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:34716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZQO-0006rB-OO for 68146@debbugs.gnu.org; Sat, 30 Dec 2023 08:30:49 -0500 Received: from localhost.localdomain (bba-2-51-3-250.alshamil.net.ae [2.51.3.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id D63C37F4; Sat, 30 Dec 2023 13:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1703943042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YD/C85PSBPVnPI9jkgrD5kGNpR9cX9X8HySJW36FdT4=; b=eEQenbrENpi++01lMQRYQNm7V+ZYP0GjLUlcazwhw2d282iZP0wRY5dcVSpChtdrpi0Bfx QU0P2qJe3KHw/B11KF0/2OtsHh8zNFHwHS/rGV7/Vcder7SjQA9AVrBjbp0zxJXRMOp4Ii m32C608BIURm9PteX99eauQhdarFMlL414LcxlClIavfPnCqukAqOLVa4u3KEIXEe2M744 2fFzRC02eqRpI6VaQxRcXIaPml9SYsl9J9MZJctYOQ3W4lUUmXywzY6sAJmvQqBR0//zYA MQSiqhJ6FJTXXNTPya/CqVW9BYzQ+1uBWma6CpuK95oW81sW9Y9QGipXURaguixD2+9cPM J1G0ef1ZJVVwnSoPpZ4hqiGe4ikf55fzFyvdK3vBPcIolOSCz+kVZAXIaqdW8YVHqKgZFO ZRdJB0jTaAmk4n7BlmsCOtCCJY253HWrP6qRiD4kJs12vZ37tCWaEToBEmYUz0+yDl7YD4 +nT9lqhq9pdtlAuCD6naCk8zFYg1w5gAX1OKSAWiM9Ef75ZLow40Utoom8MG5jQrHHfsvs d0OkcrL9hNnZUSxTK7UkZ19YGuJ3YebrPPz5cDsBG9MjgFjcLMZJNd3iAXODp+tHqQu2Tn 3gA7ydmyFKntFMxx93HdiF4D8MD+X/bOiSM3MNhrfXBe4RbVsU2t8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1703943042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YD/C85PSBPVnPI9jkgrD5kGNpR9cX9X8HySJW36FdT4=; b=3xFukWFj8/fw+xVjtX19F4HDFatKB7tVO/uMHUk1lMqusTP36SuvQ/Kl846fF9EVhQW2Pg E1TWJsZnBg/BdPAA== From: Ahmad Draidi Date: Sat, 30 Dec 2023 17:28:48 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wm.scm (labwc): Update to 0.7.0. Change-Id: I35f7faf2ba3975481780b49d0dcdef6f39af46bc --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8c228de1b5..029346dc98 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -3016,7 +3016,7 @@ (define-public libucl (define-public labwc (package (name "labwc") - (version "0.6.5") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -3025,7 +3025,7 @@ (define-public labwc (file-name (git-file-name name version)) (sha256 (base32 - "04401k1i6b9s2v6mbhw5llla8fdpkhmgz826iva246iqch9z20lx")))) + "17p3wcnggnd4v37z1dgv8nmc35nq4261s8sglr44bf71vjircggz")))) (build-system meson-build-system) (native-inputs (list pkg-config gettext-minimal scdoc)) -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH v2 1/3] gnu: Add libdisplay-info. References: In-Reply-To: Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68146-submit@debbugs.gnu.org id=B68146.17070549882282 (code B ref 68146); Sun, 04 Feb 2024 13:57:02 +0000 Received: (at 68146) by debbugs.gnu.org; 4 Feb 2024 13:56:28 +0000 Received: from localhost ([127.0.0.1]:48458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWcyx-0000aj-J8 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 08:56:28 -0500 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:33352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWcys-0000a9-IU for 68146@debbugs.gnu.org; Sun, 04 Feb 2024 08:56:26 -0500 Received: from localhost.localdomain (bba-86-99-233-146.alshamil.net.ae [86.99.233.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 63F8F4370; Sun, 4 Feb 2024 13:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1707054961; 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; bh=ZPeTHhQo+rUibtdbk/8W6WjLj7U7fzVveIbMHcXsTP8=; b=Zqx1+Gq7J8Lq+j1L03cA9eiV3O2cHjn8w7/iP95DdS2JjddnxduzFeMcqLScUxXWvwIEAb VUxZKM69msYm8XV4L19oWahlElVq8KZ7EJ7F14dmQlyDf8fhc2+sfaDeuYEAhmK5VCqqVP IAh1VJIUEN5MYFwHM/2aOOiDa1l8u+voyORc/RGdGxS2xlAWu9AVElyH6vFakrYnc/9odD lO0CJXphrwgEyc9s7G2gIDCT45f11ig9BkxBNoDFMeVz8+6xtZH7eUDygdtARA9jnU3uIz xUIr69MVVQGsKGi+ar7yE/4VymaYrEMZVjTi1nL3/cqYXEhzmUdJ6I4vgFiqwhYwuwXx7O 396r1Ts9Ir6fCNoOiMdRmy5kMt8bfJTbpMTbhsYTBKRwFIMwYOJoqiAyZI/5Kq9JrKUf6y +Hig3GPixQ/4h/jdlY9mJxGSQIWrqZXWGd0o/XkZ/tX7FNIucSMh5hxWZssf3cCIRk8seU qA8fQp483hRBgJFYlwFSsSa/wXaXIjT1ME3I33kFlKjMmgoo+yUhvGDJH5+Juf9joe/y5n mz6qhfznqV59Xri9w/+DZVPW5+eJGciKWqGzdgIlKlXWZvaVtZYmzr9Q9idSANXqkr283e SrSQ8mgNHs4A3BafVVqyRs4d487K+/x7H7Msieou3ytn9DnZpcHoU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1707054961; 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; bh=ZPeTHhQo+rUibtdbk/8W6WjLj7U7fzVveIbMHcXsTP8=; b=Iufn8YaFtfptz0L2b4/4MlcWcdxspTUNNw0ixKcdz5buQFPhzQ3a9c1YTBMWj2EUtTnuJw KJbpotHE6a2MNkBw== From: Ahmad Draidi Date: Sun, 4 Feb 2024 17:54:41 +0400 Message-ID: <8ccce65087f8378fb064d1c5fb1394b743e06eaa.1707054720.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/freedesktop.scm (libdisplay-info): New variable. Change-Id: Ifa03e4f21dd869c664c5bbf47af4ea1b7cf63d44 --- v2: Rebase gnu/packages/freedesktop.scm | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 648ebad408..9ba444cb0a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure +;;; Copyright © 2024 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,6 +98,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hardware) #:use-module (gnu packages hunspell) #:use-module (gnu packages ibus) #:use-module (gnu packages image) @@ -114,6 +116,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages python) @@ -2102,6 +2105,43 @@ (define-public colord-gtk that wish to perform colour calibration.") (license license:lgpl2.1+))) +(define-public libdisplay-info + ;; Latest commit passes tests while 0.1.1 doesn't + (let ((commit "ebee35935dad01478ae1ae5ead298c4cd8018ac2") + (revision "1")) + (package + (name "libdisplay-info") + (version (git-version "0.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/emersion/libdisplay-info") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ly8acdjxn8l55y0wc07n7pb6rzh9dpr1vbsakdib2zrl0i5yh3a")))) + (build-system meson-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-before 'configure 'fix-meson-file + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "meson.build" + (("/usr/share/hwdata/pnp.ids") + (string-append (assoc-ref (or native-inputs inputs) + "hwdata") + "/share/hwdata/pnp.ids")))))))) + (native-inputs (list edid-decode + `(,hwdata "pnp") pkg-config python-wrapper)) + (home-page "https://gitlab.freedesktop.org/emersion/libdisplay-info") + (synopsis "EDID and DisplayID library") + (description + "libdisplay-info is an EDID and DisplayID library that provides a set of + high-level, easy-to-use, opinionated functions as well as low-level functions +to access detailed information.") + (license license:expat)))) + (define-public libfprint (package (name "libfprint") base-commit: abeffc82379c4f9bd2e6226ea27453b22cb4e0c8 -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH v2 2/3] gnu: Update wlroots to 0.17.1. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68146-submit@debbugs.gnu.org id=B68146.17070549912292 (code B ref 68146); Sun, 04 Feb 2024 13:57:02 +0000 Received: (at 68146) by debbugs.gnu.org; 4 Feb 2024 13:56:31 +0000 Received: from localhost ([127.0.0.1]:48460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWcyy-0000al-3g for submit@debbugs.gnu.org; Sun, 04 Feb 2024 08:56:31 -0500 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:52266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWcyu-0000aE-7T for 68146@debbugs.gnu.org; Sun, 04 Feb 2024 08:56:26 -0500 Received: from localhost.localdomain (bba-86-99-233-146.alshamil.net.ae [86.99.233.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id F13AA446A; Sun, 4 Feb 2024 13:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1707054965; 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=TybYYGSEg4Xzcp49REGw9hQLWOKSovI5G2gQJ50Jxic=; b=chF49nbqzQ9MjNeOsIE+QVSwqatxDRLZI3C0cCl424n/P3KQaAJu0G9E35tFKh59NYZTDh W7rMj/46KBuIlngmq4aBSidFdQPIrSoCXvz1O3Te5Nv5odfFhS80ziTRRw6JqHWv69DYU2 7yyEr0GMnfUQNyWxBxqASaFOA0mJ1hvtDh6QggLT+lEJQw8BeFW8P1mWaT5BOZrjhXIJ7R Psc1YtiMcYK4oKcXvkUvumkgDgS49rV+5zJoGnHnKw+yZIRU7NSpxTf8RBn5dJhOmUpk4X 5TQVfEvCUqTdag+/yTNTIoioQIaQCbA+d5CQ9SZXwmBZB8NdQlVgjWarJ1l6dc0l4bphAe gE1WS/nfKSlrUbAhPI9Ydjw7EMURvP+jGdm1YvbFagSO7vrUMv6b2kvKaOsbxYPCTv+hLy ZBASAcB92bh/0ohWNBmArXGO/28bNFDHxVURQaJi2q8y3h+q+3uQdWNJe+nMXJNPyP13Ta WR+xbC/0riaN5nJVOSpv8g9TX9ltY9LsbSv5XtALLjJjyYzRbF6zXe71Ck1IItX2ikcoPg vkFwRC62e4jzdkQF7TH2LCGpF5s5DoKYhLqT3EWNT2rKqZ+ehEqcu1bYqCIf1SYRatE8x1 8iPd9VREMJFkT+248nHX4V4V+aMNvZqHc6ZiexMhR1HeD1eQ2HBHI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1707054965; 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=TybYYGSEg4Xzcp49REGw9hQLWOKSovI5G2gQJ50Jxic=; b=vqWAzyre690NtA1HeICjYOfqWeano9zaRyr5aHjlfQxMEpYy/qP4yKSLto/4gdxmD+FFYJ 5/ssSkfO/uCV5zBg== From: Ahmad Draidi Date: Sun, 4 Feb 2024 17:54:42 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <8ccce65087f8378fb064d1c5fb1394b743e06eaa.1707054720.git.a.r.draidi@redscript.org> References: <8ccce65087f8378fb064d1c5fb1394b743e06eaa.1707054720.git.a.r.draidi@redscript.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Also keep wlroots 0.16 since a few packages break without it. * gnu/packages/wm.scm (wlroots): Update to 0.17.1. [source]: Add patch. [propagated-inputs]: Add libdisplay-info. * gnu/packages/patches/wlroots-hwdata-fallback.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/wm.scm (wlroots-0.16): New variable. * gnu/packages/wm.scm (cage)[inputs]: Replace wlroots with wlroots-0.16. * gnu/packages/wm.scm (fnott)[inputs]: Likewise. * gnu/packages/wm.scm (dwl)[inputs]: Likewise. * gnu/packages/wm.scm (sway)[inputs]: Likewise. * gnu/packages/wm.scm (cagebreak)[inputs]: Likewise. * gnu/packages/wm.scm (hikari)[inputs]: Likewise. * gnu/packages/wm.scm (river)[native-inputs]: Likewise. Change-Id: Ib3d3938d6486fb1674380811a6dc0a512c991ac7 --- v2: Rebase and fix conflict gnu/local.mk | 1 + .../patches/wlroots-hwdata-fallback.patch | 46 +++++++++++++++++++ gnu/packages/wm.scm | 37 +++++++++++---- gnu/packages/zig-xyz.scm | 2 +- 4 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbdb285695..961dc6a456 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2173,6 +2173,7 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-big-endian.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-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch new file mode 100644 index 0000000000..6468c7cbf3 --- /dev/null +++ b/gnu/packages/patches/wlroots-hwdata-fallback.patch @@ -0,0 +1,46 @@ +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 959928d8e2..78af2fb210 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -66,6 +66,7 @@ ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Jaeme Sifat ;;; Copyright © 2023 Josselin Poiret +;;; Copyright © 2024 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -207,7 +208,7 @@ (define-public cage (sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) - (inputs (list wayland wlroots libxkbcommon)) + (inputs (list wayland wlroots-0.16 libxkbcommon)) (home-page "https://github.com/cage-kiosk/cage") (synopsis "Wayland kiosk") (description "This package provides a Wayland @dfn{kiosk}, which runs a @@ -1167,7 +1168,7 @@ (define-public fnott tllist scdoc)) (inputs - (list wlroots wayland fcft dbus libpng)) + (list wlroots-0.16 wayland fcft dbus libpng)) (home-page "https://codeberg.org/dnkl/fnott") (synopsis "Keyboard driven and lightweight Wayland notification daemon") (description "Fnott is a keyboard driven and lightweight notification daemon @@ -1569,7 +1570,7 @@ (define-public dwl (native-inputs (list pkg-config)) (inputs - (list wlroots)) + (list wlroots-0.16)) (home-page "https://github.com/djpohly/dwl") (synopsis "Dynamic window manager for Wayland") (description @@ -1675,7 +1676,7 @@ (define-public polybar (define-public wlroots (package (name "wlroots") - (version "0.16.2") + (version "0.17.1") (source (origin (method git-fetch) @@ -1684,7 +1685,9 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m12nv6avgnz626h3giqp6gcx44w1wq6z0jy780mx8z255ic7q15")))) + (base32 "1hj4gq5vx8in65622yvjm8bwqkw2vpc556k9my997a0hn0ricj37")) + ;; This patch can be removed once hwdata in Guix supports pkg-config + (patches (search-patches "wlroots-hwdata-fallback.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -1705,6 +1708,7 @@ (define-public wlroots (propagated-inputs (list ;; As required by wlroots.pc. eudev + libdisplay-info libinput-minimal libxkbcommon mesa @@ -1730,6 +1734,23 @@ (define-public wlroots modules for building a Wayland compositor.") (license license:expat))) ; MIT license +(define-public wlroots-0.16 + (package + (inherit wlroots) + (name "wlroots-0.16") + (version "0.16.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/wlroots/wlroots") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m12nv6avgnz626h3giqp6gcx44w1wq6z0jy780mx8z255ic7q15")))) + (propagated-inputs (modify-inputs (package-propagated-inputs wlroots) + (delete libdisplay-info))))) + (define-public sway (package (name "sway") @@ -1774,7 +1795,7 @@ (define-public sway pcre2 swaybg wayland - wlroots)) + wlroots-0.16)) (native-inputs (cons* linux-pam mesa pkg-config scdoc wayland-protocols (if (%current-target-system) @@ -2966,7 +2987,7 @@ (define-public cagebreak (("/etc/") (string-append #$output "/etc/")) (("/usr/share/") (string-append #$output "/usr/share/")))))))) (native-inputs (list pkg-config scdoc)) - (inputs (list libevdev pango wlroots)) + (inputs (list libevdev pango wlroots-0.16)) (home-page "https://github.com/project-repo/cagebreak") (synopsis "Tiling wayland compositor inspired by ratpoison") (description @@ -3063,7 +3084,7 @@ (define-public hikari linux-pam pango wayland - wlroots)) + wlroots-0.16)) (arguments `(#:tests? #f ; no tests #:make-flags diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 200b5c9940..75b60fcfa9 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -61,7 +61,7 @@ (define-public river scdoc wayland wayland-protocols - wlroots)) + wlroots-0.16)) (home-page "https://github.com/riverwm/river") (synopsis "Dynamic tiling Wayland compositor") (description -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#68146] [PATCH v2 3/3] gnu: labwc: Update to 0.7.0. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 13:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68146@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68146-submit@debbugs.gnu.org id=B68146.17070549912299 (code B ref 68146); Sun, 04 Feb 2024 13:57:03 +0000 Received: (at 68146) by debbugs.gnu.org; 4 Feb 2024 13:56:31 +0000 Received: from localhost ([127.0.0.1]:48462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWcz1-0000av-FT for submit@debbugs.gnu.org; Sun, 04 Feb 2024 08:56:31 -0500 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:59252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWcyx-0000aO-19 for 68146@debbugs.gnu.org; Sun, 04 Feb 2024 08:56:27 -0500 Received: from localhost.localdomain (bba-86-99-233-146.alshamil.net.ae [86.99.233.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 261364473; Sun, 4 Feb 2024 13:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1707054969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GBAWIvlBfZtOBP7r10yJjYELxWj7WtOlAkPiYniNFw0=; b=BtTCi+YUcKhTBiIe6f1v6UwUDzzRO2iV3JEmdYSlRDjgE62Pl5Qv7yeilKjIVgMgIzP9tE 2m05JaRh75oGhn4hzr4H1l6g0SsvC32+OfpbpK/9USsmDZnX4g0uXgTIZdf210DrHsrmLB ER/GSsrh7V3aSCGa37OMAlI5hBiIPcG7I9qdBZcWSxg5zx1FlkXVZI10eHbjzABvqccoEw /qDRwFv/s8hovW/PKGBAQX1Gsm9xlSG47U52HVnalYS6QpaqoAQcbz2M0xlnX++lWpMHTF lTvqnZG1tsY9e09DNmmHCnzGGhAuGVNsDDDAkGkVavfZRXY0CTutQPnbY/EnVt4fYdjXGG kRiROW5huE4FTv6j2ljHo/F7ZD7qIIPn9bye4Ireg6+rcmJJDXEh8Rnyr0keoivz7PqEG+ /DRjgFEoyOp7FisStHrfR40t5w6Qk+B2ai2w5E8j7ObaPrYgc2PqQiJTD+NzbUQHcyPC9P duUpm43n9T2AAbZLYfcB00nF0TkXYQ0toc3ldaPSTW/BLhn65uMmdQtTzD8F0GZjCPl078 ZDIva7XP3y4LQBRef1cRkJQ5YikUD1Mbi1jEd4ColFXs/xWd9cw4uF/n9KJIHfeQwzXZ3Q WL6vt91iQK36cfxU5FCJSOFexeKN7bAwadJnzLih0Eg/N8YdvFr30= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1707054969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GBAWIvlBfZtOBP7r10yJjYELxWj7WtOlAkPiYniNFw0=; b=1aY2Z1E0n03kdJ3LOuYB2ndbk0jI/z0asltxoAHex21jaHHZ4dqacM/BqdsjKhRE2OJ6/5 PomMryDtjM5UcZDw== From: Ahmad Draidi Date: Sun, 4 Feb 2024 17:54:43 +0400 Message-ID: <7e027496c1e725a7b004ed32b7b1f90fda162164.1707054720.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <8ccce65087f8378fb064d1c5fb1394b743e06eaa.1707054720.git.a.r.draidi@redscript.org> References: <8ccce65087f8378fb064d1c5fb1394b743e06eaa.1707054720.git.a.r.draidi@redscript.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wm.scm (labwc): Update to 0.7.0. Change-Id: I35f7faf2ba3975481780b49d0dcdef6f39af46bc --- v2: Rebase gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 78af2fb210..85bb6de834 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -3023,7 +3023,7 @@ (define-public libucl (define-public labwc (package (name "labwc") - (version "0.6.5") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -3032,7 +3032,7 @@ (define-public labwc (file-name (git-file-name name version)) (sha256 (base32 - "04401k1i6b9s2v6mbhw5llla8fdpkhmgz826iva246iqch9z20lx")))) + "17p3wcnggnd4v37z1dgv8nmc35nq4261s8sglr44bf71vjircggz")))) (build-system meson-build-system) (native-inputs (list pkg-config gettext-minimal scdoc)) -- 2.41.0 From unknown Thu Aug 14 22:20:23 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ahmad Draidi Subject: bug#68146: closed (Re: [bug#68146] [PATCH v2 3/3] gnu: labwc: Update to 0.7.0.) Message-ID: References: <87zfvv95no.fsf@protonmail.com> X-Gnu-PR-Message: they-closed 68146 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 68146@debbugs.gnu.org Date: Tue, 20 Feb 2024 03:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1708399742-26119-1" This is a multi-part message in MIME format... ------------=_1708399742-26119-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #68146: [PATCH 0/3] Update labwc, wlroots, and shuffle some deps around which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 68146@debbugs.gnu.org. --=20 68146: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D68146 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1708399742-26119-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 68146-done) by debbugs.gnu.org; 20 Feb 2024 03:28:23 +0000 Received: from localhost ([127.0.0.1]:44063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcGnv-0006mG-F4 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 22:28:23 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:27669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcGnt-0006m2-59 for 68146-done@debbugs.gnu.org; Mon, 19 Feb 2024 22:28:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1708399673; x=1708658873; bh=jVzY5JLezOPlghH3vACjsCo+2G+1ubNNJUK+hnDxnpQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=P5cgNwegU6xoPg/k/nPEhXfb176z4tXpcItgcY+JwXKTNa8RjnH4jT7oz2zc3/XQl tUoWZZAChIVn98eP5mQvXlzhoYMOpPuK574emM3b8E1hR5W0W1ir41zQMaS+GvvwE2 qGTXOnrn1usgrj+NPCX/MEvSU/nL7pOTNlJ2NCh4X+O3fVVWNBq+RhkDQoS1xVTiOU 2i6l/48irbm2uiJuu9GunzKFrbYWrCpMdtUlXdMMVlRVR3T6luU8VBvB/kh9GWvTez 9i1DDY3X89FwBllQ/P30P6LzYLAaI+XbVodsSvYAIvwgMqeGAgt9jEV2fAF/QviGzk pEl5IjwNuYZvg== Date: Tue, 20 Feb 2024 03:27:37 +0000 To: Ahmad Draidi From: John Kehayias Subject: Re: [bug#68146] [PATCH v2 3/3] gnu: labwc: Update to 0.7.0. Message-ID: <87zfvv95no.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Ahmad, On Sun, Feb 04, 2024 at 05:54 PM, Ahmad Draidi wrote: > * gnu/packages/wm.scm (labwc): Update to 0.7.0. > > Change-Id: I35f7faf2ba3975481780b49d0dcdef6f39af46bc > --- > v2: Rebase > Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [185.70.43.16 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (john.kehayias[at]protonmail.com) 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 68146-done Cc: Simon Tournier , paren@disroot.org, =?utf-8?Q?Ludovic_Court=C3=A8s?= , Tobias Geerinckx-Rice , Ricardo Wurmus , Raghav Gururajan , jgart , Mathieu Othacehe , Christopher Baines , 68146-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) Hi Ahmad, On Sun, Feb 04, 2024 at 05:54 PM, Ahmad Draidi wrote: > * gnu/packages/wm.scm (labwc): Update to 0.7.0. > > Change-Id: I35f7faf2ba3975481780b49d0dcdef6f39af46bc > --- > v2: Rebase > Thanks! The first patch, for libdisplay-info was no longer needed as a patch to add that was pushed in b23fd4fb3e345d7c17b0e668bf790d310426f02b. I pushed the second two patches starting at b4148713d18c4b6c37639653de5191eb7f1ca4cc (very minor change in a commit message) after checking wlroots and a couple of dependents build locally though QA already looked good. As an aside, we are closer now to adding hyprland which I have working locally from another channel. On mesa-updates I will do the libdrm update which is the only blocker besides adding some packages, I believe. We'll also need a newer, pre-release, version of wlroots as hyprland seems to track the latest commits. Thanks again! John > gnu/packages/wm.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm > index 78af2fb210..85bb6de834 100644 > --- a/gnu/packages/wm.scm > +++ b/gnu/packages/wm.scm > @@ -3023,7 +3023,7 @@ (define-public libucl > (define-public labwc > (package > (name "labwc") > - (version "0.6.5") > + (version "0.7.0") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -3032,7 +3032,7 @@ (define-public labwc > (file-name (git-file-name name version)) > (sha256 > (base32 > - "04401k1i6b9s2v6mbhw5llla8fdpkhmgz826iva246iqch9z20lx"))= )) > + "17p3wcnggnd4v37z1dgv8nmc35nq4261s8sglr44bf71vjircggz"))= )) > (build-system meson-build-system) > (native-inputs > (list pkg-config gettext-minimal scdoc)) ------------=_1708399742-26119-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Dec 2023 13:27:05 +0000 Received: from localhost ([127.0.0.1]:43284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZMm-00057L-Ue for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:27:05 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJZMi-00056o-QM for submit@debbugs.gnu.org; Sat, 30 Dec 2023 08:27:03 -0500 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 1rJZMb-0003Bg-0d for guix-patches@gnu.org; Sat, 30 Dec 2023 08:26:53 -0500 Received: from rainycloud.ext.redscript.org ([103.105.48.212]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJZMY-00064s-QU for guix-patches@gnu.org; Sat, 30 Dec 2023 08:26:52 -0500 Received: from localhost.localdomain (bba-2-51-3-250.alshamil.net.ae [2.51.3.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 197527BB; Sat, 30 Dec 2023 13:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1703942805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JMG//fWI3dxIiMfH/3dQrtE5VcDcWzjb38YXKtY7d1c=; b=c+ZjEu0F6xn6l4myVWI2/EGh+1jviKU7IyHESxySRiGT6IFbscJnZ+HrP7eFr4+rMVFcl7 ZzLdLog5NAMw+sYURgIhvv8yQpRnW5NTmckOq+97mjxhb7JUfIrXAfylKjEFz2KhD/tbci OEP+JRC0atH+AmyXZF9pGTs7LJ6npZ/JKICnZ8AQP1YeRK6MJXRuSgjBAfu+mvBUhodwim svI67Qraygxi6K06Fx5+wmyukJe2G9/WHANM0QZEV/qG5ZyNKOMZLUKh6jVOqKAX0DYxh4 e3Jst4ev7m0DwwD/I1QIej+O3YjJxtqIWJukRUnQ0ZfzQuoB08zUZysBXIsTUMll1EZpzZ stJDqes3AnELucSGiZ9DpKdU0/JHuzjKx1Uznz+qVrKqPnaoQtOAPeYtAEHom8ws5N7w/8 FDNB0o0qJ4g91k68ABPxETINjbKaZR52/YugprrrZ/FxWJbYL+dIgKXwGObknPvdOzkj/f d5bOmvKRMXhupvm/ugzhQru8tsEVjb5hqLqs//TWcYGdtVUbHQaVcJ5sbvmvlY3UmYSLrR QtRs2SsfkizWOeMsTpnUiSaCbYZbd8buz5oqyF+95ia38HTbOghXi0qr3vDPRtKWyVUnSi 974wE6cvFWVmg8cop3vCPXxAONaOfQCxh93YvFWFztGwGR27Gs6WE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1703942805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JMG//fWI3dxIiMfH/3dQrtE5VcDcWzjb38YXKtY7d1c=; b=u+DnW3mrKhOJObeGsRwx5JCLL6tWe5BA6Er+gPzQ8xnRrPn2ALfzlZHFiGQxAeErEdHE5G 0P5B7t6QW2v0MAAw== From: Ahmad Draidi To: guix-patches@gnu.org Subject: [PATCH 0/3] Update labwc, wlroots, and shuffle some deps around Date: Sat, 30 Dec 2023 17:21:59 +0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: ( , Christopher Baines , Ludovic Courtès , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.105.48.212; envelope-from=a.r.draidi@redscript.org; helo=rainycloud.ext.redscript.org 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Ahmad Draidi X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) Hello Guix! The notable change in this patch series is that it updates wlroots to 0.17 since it's required by labwc 0.7, but also retains wlroots 0.16 as wlroots-0.16 and switches wlroots users to it, since they don't support 0.17 yet. Ahmad Draidi (3): gnu: Add libdisplay-info. gnu: Update wlroots to 0.17.1. gnu: labwc: Update to 0.7.0. gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 40 ++++++++++++++++ .../patches/wlroots-hwdata-fallback.patch | 46 +++++++++++++++++++ gnu/packages/wm.scm | 41 +++++++++++++---- gnu/packages/zig-xyz.scm | 2 +- 5 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch base-commit: 4d8b93e865ba71d2baa606d11529c3ecb5f14aea -- 2.41.0 ------------=_1708399742-26119-1--