From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4AL7CN2M4WNXnwAAbAwnHQ (envelope-from ) for ; Tue, 07 Feb 2023 00:27:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OKjkCN2M4WOZgQAAauVa8A (envelope-from ) for ; Tue, 07 Feb 2023 00:27:25 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E95163EA70 for ; Tue, 7 Feb 2023 00:27:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPAt6-0007OW-SX; Mon, 06 Feb 2023 18:27:04 -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 1pPAt4-0007OM-Td for guix-patches@gnu.org; Mon, 06 Feb 2023 18:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPAt4-00052P-KW for guix-patches@gnu.org; Mon, 06 Feb 2023 18:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPAt4-0000i7-GX for guix-patches@gnu.org; Mon, 06 Feb 2023 18:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61331] [PATCH 3/6] gnu: Update wlroots to 0.16.1. References: <20230206231710.sh5pmgknkoulasvo@blackbox> In-Reply-To: <20230206231710.sh5pmgknkoulasvo@blackbox> Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Feb 2023 23:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61331 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61331@debbugs.gnu.org Received: via spool by 61331-submit@debbugs.gnu.org id=B61331.16757259892694 (code B ref 61331); Mon, 06 Feb 2023 23:27:02 +0000 Received: (at 61331) by debbugs.gnu.org; 6 Feb 2023 23:26:29 +0000 Received: from localhost ([127.0.0.1]:50383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPAsW-0000hO-Qc for submit@debbugs.gnu.org; Mon, 06 Feb 2023 18:26:29 -0500 Received: from chimborazo.ee.ethz.ch ([129.132.2.15]:54097) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPAsU-0000h5-Cr for 61331@debbugs.gnu.org; Mon, 06 Feb 2023 18:26:27 -0500 Received: from blackbox (unknown [85.195.207.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id C2EC74001E for <61331@debbugs.gnu.org>; Tue, 7 Feb 2023 00:26:20 +0100 (CET) Date: Tue, 7 Feb 2023 00:26:17 +0100 From: Gabriel Wicki Message-ID: <20230206232617.yokszg43hrv2g5iw@blackbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675726045; a=rsa-sha256; cv=none; b=jYVmSfO7x29sDdr3bwLVSdRDe7gVA1SFDdF6y1NxR1BQ/bhcbI+8KS0RfF3iVp4XXQxQt1 Y3RFa9sPfx5mQKLMmi5DUvwt9n9vH0HwDlbAQ13u4eOevNhIvDOSIp2Q1S4ySUfKw75P+N TeCBJn6G4MO6Z2MhC4eMaoqchEYtQTU0cj9p8yy6V0b04SrxCAF5TRT1nssTblb/pjKg2y RNI/oJGoYLdQvRJWKjwD67qHfHXhtsn0doHdfTXvCzYydD2cKzamgkKvZUXEbUMYvRyBQW jkBqy2hDVLGwuBq21x8jR+iYHs3pSMeVSMgri8dYVzHNJgnxUyLd4PnaAnlPlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675726045; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=SnGrHggqmc84trWCksfC/eTra3n3wA0q7VLqJLq4ZEw=; b=s7ZD5Eq1vZtuOnPbQKFf+jF9fDeLYJQ/aSFCznDrSWkLEgZt4FFWnrwruQPcvcDJHnIAmc NH9F2cOh4lc23qZ3nC53h5w6YMFH/SV2gA2VCkdkTAB4sf3bDGGZbzXQi80zMLo1HaWJ6Y kNPHzqhF75TzDwV8kzYlTcblzfwLTtopYcGviRs+djw7zcOO4xsYWQuhFD/DPHoCtSZIIm DbGJi2bhjWTfdDVHlP8b5+uozTcqq9YttDJuLJVX0yF3R6MPTT51mlW+rnAMVtoAmwIzgD nVKJfRYdAwXaZt3aC8FkPqlUAvN1WrK58Q69DzRKpe4EklurRZ5uFcL6Ffc2lw== X-Migadu-Queue-Id: E95163EA70 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Spam-Score: -3.09 X-Spam-Score: -3.09 X-TUID: slyf9F/qWA6g >From 736f047384082f4eaa1ed1414ec3e0595ec19816 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Sun, 5 Feb 2023 00:27:20 +0100 Subject: [PATCH 3/6] gnu: Update wlroots to 0.16.1. * gnu/packages/wm.scm (wlroots): Update to version 0.16.1. --- gnu/packages/wm.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a860ed1f93..8f812bc14b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -101,6 +101,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -130,6 +131,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages maths) #:use-module (gnu packages mpd) #:use-module (gnu packages pcre) + #:use-module (gnu packages pciutils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) @@ -146,6 +148,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -1538,16 +1541,16 @@ (define-public polybar (define-public wlroots (package (name "wlroots") - (version "0.14.1") + (version "0.16.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/swaywm/wlroots") + (url "https://gitlab.freedesktop.org/wlroots/wlroots.git") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1")))) + (base32 "11kcica9waj1a1xgbi12gif9z5z0b4xzycbcgawbgdmj77pws8sk")))) (build-system meson-build-system) (arguments `(#:phases @@ -1558,7 +1561,16 @@ (define-public wlroots (("Xwayland") (string-append (assoc-ref inputs "xorg-server-xwayland") "/bin/Xwayland"))) + #t)) + (add-before 'configure 'fix-meson-file + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "backend/drm/meson.build" + (("/usr/share/hwdata/pnp.ids") + (string-append (assoc-ref inputs "hwdata") + "/share/hwdata/pnp.ids"))) #t))))) + (inputs (list cmake + `(,hwdata "pnp"))) (propagated-inputs (list ;; As required by wlroots.pc. eudev @@ -1567,8 +1579,9 @@ (define-public wlroots mesa pixman libseat + vulkan-headers wayland - wayland-protocols + wayland-protocols-next xcb-util-errors xcb-util-wm xorg-server-xwayland)) -- 2.38.1