From unknown Wed Jun 18 23:08:44 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#73124 <73124@debbugs.gnu.org> To: bug#73124 <73124@debbugs.gnu.org> Subject: Status: [PATCH 0/3] gnu: wlroots: update on mesa-updates Reply-To: bug#73124 <73124@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:08:44 +0000 retitle 73124 [PATCH 0/3] gnu: wlroots: update on mesa-updates reassign 73124 guix-patches submitter 73124 Rutherther severity 73124 normal tag 73124 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 13:28:02 2024 Received: (at submit) by debbugs.gnu.org; 8 Sep 2024 17:28:02 +0000 Received: from localhost ([127.0.0.1]:59979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLhh-0000gr-S8 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:28:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:56214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLhf-0000gf-Ga for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:28:00 -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 1snLhc-00023V-O5 for guix-patches@gnu.org; Sun, 08 Sep 2024 13:27:56 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snLha-0005Vi-Jp for guix-patches@gnu.org; Sun, 08 Sep 2024 13:27:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725816470; x=1726075670; bh=i/RaIB3dQysKcoUtIkkumGpsqetilBcsIqGcPrVC9eA=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=VpNtiJX1X9FivdjgRSe/vwjUuxI/5dm4Wt8EF2YRUcZ0utd3Yv7x/zHt5fY2ZDmhy /NH87QthjWWxdEK25ezd0chiC6G7AeMIef98J6Yg4Ikum8W3NFj7bYLIghzpmEz4S0 Bkl8R2Qygtd68uWJVZNwM3q34F9E8LJK/1zGpLiPAlBJzKQhrlfoSYoHW/vGsdGRn1 SPlRdS5kBa54/6s1dwR7hbO6XqhE2sup8zmJ6Mn5RRyVQj35OTVLq9Y63XAi2gu5sS 5ncLeohZaQEsVKnCEDZbD3moW3H85/RZ9GIKiXCgVewCM4R58gwyy/AckbtfTWiNU+ NaOmngv979p6Q== Date: Sun, 08 Sep 2024 17:27:46 +0000 To: guix-patches@gnu.org From: Rutherther Subject: [PATCH 0/3] gnu: wlroots: update on mesa-updates Message-ID: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 70c25c9156af469f72ce19b64af5c0b7f9417d1b MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.131; envelope-from=rutherther@protonmail.com; helo=mail-40131.protonmail.ch 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, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: John Kehayias , Rutherther 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: -2.3 (--) Hello all, This patch series adds wlroots 0.18. To do that, I've also updated wayland to 1.23. This patch series should be applied onto mesa-updates, since it requires libdrm >=3D2.4.122 that is not present on master branch. Since wlroots introduces breaking changes in all major releases, and decided to rename wlroots.pc to wlroots-version.pc, I've made sure to expose all wlroots versions with symbol wlroots-X.XX. I've kept the wlroots symbol pointing to wlroots-0.17 to make sure no breakage of existing packages occurs. I've also removed no longer necessary wlroots-hwdata-fallback.patch, as that one was provided to make sure hwdata was found when it was not using pkgconfig. Hwdata started using pkgconfig, so now the patch is no longer necessary. Regards, Rutherther Rutherther (3): gnu: wayland: Update to 1.23.1 gnu: wlroots: add 0.18 gnu: wlroots: Remove hwdata patch gnu/local.mk | 1 - gnu/packages/freedesktop.scm | 4 +- .../patches/wlroots-hwdata-fallback.patch | 46 ------------------- gnu/packages/wm.scm | 29 +++++++++--- 4 files changed, 24 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch base-commit: fafd0245505fad7629ec98cef8d15e6e478f3f98 -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 13:30:23 2024 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 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH 1/3] gnu: wayland: Update to 1.23.1 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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 (-) 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 --=20 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 13:30:27 2024 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 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH 2/3] gnu: wlroots: add 0.18 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 21e4e089fa7ba266211c7de60d1863834fec8233 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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 (-) 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))) =20 -(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-con= fig - (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 =20 +(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 =20 (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"))))= )) =20 +(define-public wlroots wlroots-0.17) + (define-public wl-mirror (package (name "wl-mirror") --=20 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 13:30:39 2024 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 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH 3/3] gnu: wlroots: Remove hwdata patch 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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 (-) 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 =3D=09=09=09=09=09=09\ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch=09\ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch = \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch=09\ - %D%/packages/patches/wlroots-hwdata-fallback.patch=09=09\ %D%/packages/patches/wmctrl-64-fix.patch=09=09=09\ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch=09\ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch=09\ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packa= ges/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 =3D dependency( - =09'hwdata', --=09required: 'drm' in backends, -+=09required: false, - =09native: true, --=09not_found_message: 'Required for the DRM backend.', - ) -=20 - libdisplay_info =3D dependency( -@@ -19,15 +18,21 @@ libliftoff =3D dependency( - =09required: false, - ) -=20 --if not (hwdata.found() and libdisplay_info.found() and features['session'= ]) -+if hwdata.found() -+=09hwdata_dir =3D hwdata.get_variable(pkgconfig: 'pkgdatadir') -+=09pnp_ids =3D files(hwdata_dir / 'pnp.ids') -+else -+=09pnp_ids =3D files('/usr/share/hwdata/pnp.ids') -+endif -+ -+if not (libdisplay_info.found() and features['session']) - =09subdir_done() - endif -=20 --hwdata_dir =3D hwdata.get_variable(pkgconfig: 'pkgdatadir') - pnpids_c =3D custom_target( - =09'pnpids.c', - =09output: 'pnpids.c', --=09input: files(hwdata_dir / 'pnp.ids'), -+=09input: pnp_ids, - =09feed: true, - =09capture: true, - =09command: 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") --=20 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 14:26:27 2024 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:27 +0000 Received: from localhost ([127.0.0.1]:60033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcF-0003oc-3R for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:27 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:10067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcB-0003oE-VQ for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819975; x=1726079175; bh=7suCDn25C7TEDBc4ZqOf8GJwbkkj+LLAFLIhz0Ja1EI=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Vsy+39sJBvC8jykuJ1LZ347furl7veFcV6w3n7KTq5F0gaR9F3Z1gV/VDK42lJJS5 Eq7useW9Ie4DOdo210fmfwdCaVKaZ3MM7MdO61v1zQth9GPpRy+NvqUWemUizhcMMX uhZnUYqHCxJ5N2eZm97TOoyWBpki8pWNkPpa6AdN/z40Z4xoHQ3pHc3c57Kwxwm5CE GXQH1XKBIV6+zpFmgPWxTz3vVsAwb8lSRlSMYPdiQ1QZ0okMFdrAR6JlJq2tv/diAl qFIxr0oKQ5+JOV+757gbK9T6mOp2Nz2SAkSt46O+D5DbWgKp2CV9/0Dsn5aKPceXiL LavBmM9TOM0Aw== Date: Sun, 08 Sep 2024 18:26:12 +0000 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH v2 0/3] gnu: wlroots: update on mesa-updates Message-ID: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 1f26a2d8b93c8f8196375614b2d36945c35c61d5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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 (-) I've changed the order of the commits to first remove hwdata patch, as it was no longer needed. I've also added changelog style, sorry for not sending it with that on first try. This is based on feedback I got from podiki in #guix IRC channel. Rutherther (3): gnu: wlroots: Remove hwdata patch gnu: wayland: Update to 1.23.1 gnu: wlroots: add 0.18 gnu/local.mk | 1 - gnu/packages/freedesktop.scm | 4 +- .../patches/wlroots-hwdata-fallback.patch | 46 ------------------- gnu/packages/wm.scm | 30 +++++++++--- 4 files changed, 25 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch base-commit: fafd0245505fad7629ec98cef8d15e6e478f3f98 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 14:26:29 2024 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:29 +0000 Received: from localhost ([127.0.0.1]:60035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcH-0003ol-D7 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:29 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:19053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcD-0003oI-Oy for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819976; x=1726079176; bh=wQWkSrl+4T3rLP0/nb3jgl9+SRIktV/Y6c4zYdLbRuc=; 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=XjmcYZBdjw/OzsdoRUcJJxYzWPEHvsn6c1zXSLvOqgXZGWpbJENeGFSmZSJ+dp21e Wzblg7HPp9tdOD+SK6U1wlvGhFSlr7vBG1NiergTQpkOiJkrgnQSWyVksuLCvwEQan VrN1PJWmI/w7B+fR/Egnz1H0JwpCWN6qLNiahJN5StzL5QnOftvZofIvVwmq2cBRlg iMtdbt/OdidRitjRhhxN0ZIh4MplYBv/J/ApCvhbqrkMqWA+ZQw2C6AgWbu0pKZGtD fmwYHh0FCbON+vg/rzLDLsV3VabT7V0EUtdaaBJNP453fAZ+3YDWJlEiiz5sI2tlGk b2wlVFOfQLi7g== Date: Sun, 08 Sep 2024 18:26:15 +0000 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH v2 1/3] gnu: wlroots: Remove hwdata patch Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 2f05714028bf966a4a255cb3dfd6750772fe1b7e MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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: remove wlroots patch wlroots-hwdata-fallback.patch, since it's no longer necessary as hwdata package has "share/pkgconfig/hwdat= a.pc" * gnu/packages/patches/wlroots-hwdata-fallback.patch: Remove unused patch * gnu/local.mk: Remove reference of removed gnu/packages/patches/wlroots-hw= data-fallback.patch Change-Id: I4be3e203b99f1d8e4d837164d55a8c06c8fc71ee --- 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 =3D=09=09=09=09=09=09\ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch=09\ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch = \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch=09\ - %D%/packages/patches/wlroots-hwdata-fallback.patch=09=09\ %D%/packages/patches/wmctrl-64-fix.patch=09=09=09\ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch=09\ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch=09\ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packa= ges/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 =3D dependency( - =09'hwdata', --=09required: 'drm' in backends, -+=09required: false, - =09native: true, --=09not_found_message: 'Required for the DRM backend.', - ) -=20 - libdisplay_info =3D dependency( -@@ -19,15 +18,21 @@ libliftoff =3D dependency( - =09required: false, - ) -=20 --if not (hwdata.found() and libdisplay_info.found() and features['session'= ]) -+if hwdata.found() -+=09hwdata_dir =3D hwdata.get_variable(pkgconfig: 'pkgdatadir') -+=09pnp_ids =3D files(hwdata_dir / 'pnp.ids') -+else -+=09pnp_ids =3D files('/usr/share/hwdata/pnp.ids') -+endif -+ -+if not (libdisplay_info.found() and features['session']) - =09subdir_done() - endif -=20 --hwdata_dir =3D hwdata.get_variable(pkgconfig: 'pkgdatadir') - pnpids_c =3D custom_target( - =09'pnpids.c', - =09output: 'pnpids.c', --=09input: files(hwdata_dir / 'pnp.ids'), -+=09input: pnp_ids, - =09feed: true, - =09capture: true, - =09command: files('gen_pnpids.sh'), - diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d7ac3498f..30ae699550 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1735,9 +1735,7 @@ (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-con= fig - (patches (search-patches "wlroots-hwdata-fallback.patch")))) + (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")))) (build-system meson-build-system) (arguments `(#:phases --=20 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 14:26:34 2024 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:34 +0000 Received: from localhost ([127.0.0.1]:60039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcL-0003p3-S4 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:34 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:13693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcJ-0003oV-Fw for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819983; x=1726079183; bh=DuOhYXulaDFQZOF73vvtAonRWwpgACGJ5GL02+t1L2Q=; 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=TAtypECfhiQCqZjOE5I8J6dAGpMaa/VTpl7kbkqkEvb/wBdcmj1dvXczy+ePXZ7KW zCWVpKTjXrEnQ/4xbb7kDdOxOhksoiSLdrrhT4fM9v5HLlmk0HS37adgKqe8RJ4lMV Pg3FhrzfbcqCICENseE2U4hfMJvc/YN+Cj4QpLFPMgc9k1hovQnp1RkUEoZ7Ein1by yQFoFEsgEjfw3FG07Zid2JSKm/CbHKgpVsrDg+c9bQ59ego0E6mgwhXCypht/88w11 k8VsexGRgK+DClUTaUKIyfhSuOgaqV0mhf+ddP8Rxvu9OTMia7Mu2477vfH49/kKsh H8pPdUy729abA== Date: Sun, 08 Sep 2024 18:26:18 +0000 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH v2 2/3] gnu: wayland: Update to 1.23.1 Message-ID: <8211d9a1fb43ff108d1d39951226e9cbf00e6df8.1725819647.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 0d81d27a8508dd6bb6b00008b73b6b1f103de2ad MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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: Update Wayland to 1.23.1 Change-Id: Iacfeb77617cb6a039822fa7f0649a6433fa96973 --- 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 --=20 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 14:26:40 2024 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:40 +0000 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcP-0003pK-4p for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:40 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:35355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcN-0003ot-Om for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819986; x=1726079186; bh=j3ml+Kqn1Z4bEdAKZo9kLCtj6USSorokPHbTos76T+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=B4JJ0QaeFhJ1BgXjsGDoNOumAJ7uJrA8sHmrKDNmJ8fc8GbXt4ItM/c0uOFnZkYMV 48GF3C6RHuuH85Jb0jecbOWXZH8fvUKGYpLPcZAa1c1wBGyTpowe4+ONuUzTST6FcT kZloNh/XqyJi6cjmdKUVZooVKb1thiNZA3xEvPHQ9mul44p5ZQR03C2a08IZ9dPMrh vLiU7V9EFWbyB4MuiGmrUv0nVdO4eF5QxPuTVqw0Kmk7Tk/bgKu/Uf4+IkLpRIV3w/ Ib90dcdtEjdDECi5LN4W0ET3iceJB620gpr4M12oh/Mjsa9MKdsZ1Td4NNaHy4mkT0 44jlWH0X4+v6w== Date: Sun, 08 Sep 2024 18:26:22 +0000 To: 73124@debbugs.gnu.org From: Rutherther Subject: [PATCH v2 3/3] gnu: wlroots: add 0.18 Message-ID: <364529bb0d4035b63b6f94250aa3637890642a73.1725819647.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: f4ad920a079f344c3d555df62d8b3b451c7339b4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124 Cc: John Kehayias , Rutherther 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 (-) 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. * gnu/packages/wm.scm: Add wlroots-0.18, bind wlroots 0.17 to wlroots-0.17 symbol to make it easier to target specific major wlroots version. Change-Id: I377ed66e91b4adc1216d42077fe7c34178a5552b --- gnu/packages/wm.scm | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 30ae699550..b558c1223c 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))) =20 -(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,7 +1735,7 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")))) + (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")))) (build-system meson-build-system) (arguments `(#:phases @@ -1782,9 +1782,25 @@ (define-public wlroots modules for building a Wayland compositor.") (license license:expat))) ; MIT license =20 +(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 @@ -1801,7 +1817,7 @@ (define-public wlroots-0.16 =20 (define-public wlroots-0.15 (package - (inherit wlroots) + (inherit wlroots-0.18) (name "wlroots-0.15") (version "0.15.1") (source @@ -1814,6 +1830,8 @@ (define-public wlroots-0.15 (sha256 (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))= )) =20 +(define-public wlroots wlroots-0.17) + (define-public wl-mirror (package (name "wl-mirror") --=20 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 08 23:31:59 2024 Received: (at 73124-done) by debbugs.gnu.org; 9 Sep 2024 03:31:59 +0000 Received: from localhost ([127.0.0.1]:60405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snV8A-0007R1-M2 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 23:31:59 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:26089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snV87-0007Qk-VC for 73124-done@debbugs.gnu.org; Sun, 08 Sep 2024 23:31:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725852706; x=1726111906; bh=aZx4vAAx1YzFHgXkJjfOwQldS0G3B+8afFjitU6hTHE=; 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=sPzt2x/iuWh4h9gCTywOW/i9orF3QI8QP26lAYLQfLuO/TVwr1S/lqqDe4jAYb26c Lxe3yyc040nCjiibVpui/aZWNiuTHgd/VZVh86D5DUbpl8R2dkuu5zSoB/b2zKMpqd TYpsNlI3e9jXl+a+OhxFXgcAw9t0A3zFsOPT22dVG4+nSAreNKWuwVNxvQkbt7l7dC nikb5/o+ISzD/y7L35lyj3XXZqqsXkwpPRUNdKtDzpgeQQaYI2+QcBvw0kij23MZkS kA/GZsY6Pz5hdTaTD8aHI5qFPtj2M9M7thWUBO/TPO8Y/pb32WgRDo6F877hlMZjna BhH/3GFdcVNxQ== Date: Mon, 09 Sep 2024 03:31:41 +0000 To: Rutherther From: John Kehayias Subject: Re: [PATCH v2 0/3] gnu: wlroots: update on mesa-updates Message-ID: <874j6pbizq.fsf@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: ec2456543ea66dd3b8d5efa47b54dbcde3e5a891 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73124-done Cc: 73124-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: -1.0 (-) Hello, Thanks for the patches! I've applied them to mesa-updates as 108aee2706, 71= 5399c84f, and c1ca70a980 with some minor changes. Though note with rebasing= these hashes will change. The most significant was reworking the last patc= h, detailed below. (Sorry for not sending diffs against your patches, but y= ou can see the committed versions.) On Sun, Sep 08, 2024 at 06:26 PM, Rutherther wrote: > I've changed the order of the commits to first remove > hwdata patch, as it was no longer needed. I've also > added changelog style, sorry for not sending it > with that on first try. This is based on feedback > I got from podiki in #guix IRC channel. > Thanks for the changes. For changelog, some details below, but do see the m= anual for some helpers (like yasnippet in Emacs) and use the git log as ref= erence. > Rutherther (3): > gnu: wlroots: Remove hwdata patch I applied this second as it went more as a start to the wlroots updates. Fo= r changelog, be sure to use fields (what variable or record was changed in = the file) and this one didn't really need commentary. Though fine to includ= e, I opted to simplify here. > gnu: wayland: Update to 1.23.1 I applied this first. Use periods (and double spaces) in the first line and= for every change. Again, variable names go in the changelog. > gnu: wlroots: add 0.18 > Here I added myself as a coauthor for the following changes: did chain inhe= ritance (typically what we do and makes for less repeated work as things ch= ange), cleaned up wlroots-0.17 a bit for things that aren't needed, renamed= all current wlroots usage to wlroots-0.17 as there were just a few. For th= e changelog, again use variable and field names; I cleaned up the comment a= little and added one about the inconsistent names/file-names for older wlr= oots just as a note. Hope that gets everything and I didn't mess anything up! Thanks again for y= our work here and I'll see how it looks on mesa-updates. John > gnu/local.mk | 1 - > gnu/packages/freedesktop.scm | 4 +- > .../patches/wlroots-hwdata-fallback.patch | 46 ------------------- > gnu/packages/wm.scm | 30 +++++++++--- > 4 files changed, 25 insertions(+), 56 deletions(-) > delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch > > > base-commit: fafd0245505fad7629ec98cef8d15e6e478f3f98 From unknown Wed Jun 18 23:08:44 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 07 Oct 2024 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator