From patchwork Sat Dec 30 13:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 58209 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 C6C3C27BBEA; Sat, 30 Dec 2023 13:31:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 7699727BBE2 for ; Sat, 30 Dec 2023 13:31:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJZQf-0003hM-Un; Sat, 30 Dec 2023 08:31:05 -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 1rJZQc-0003f0-Ie for guix-patches@gnu.org; Sat, 30 Dec 2023 08:31:03 -0500 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 1rJZQc-0006hG-9l for guix-patches@gnu.org; Sat, 30 Dec 2023 08:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJZQc-0007Nt-QL for guix-patches@gnu.org; Sat, 30 Dec 2023 08:31:02 -0500 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== 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 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: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi 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 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