From: Jonathan Brielmaier <jonathan.brielmaier@web.de>
To: 61331@debbugs.gnu.org
Cc: Gabriel Wicki <gabriel@erlikon.ch>,
Jonathan Brielmaier <jonathan.brielmaier@web.de>
Subject: [bug#61331] [PATCH 2/4] gnu: wlroots: Update to 0.16.1.
Date: Thu, 6 Apr 2023 11:02:23 +0200 [thread overview]
Message-ID: <20230406090225.31969-2-jonathan.brielmaier@web.de> (raw)
In-Reply-To: <20230406090225.31969-1-jonathan.brielmaier@web.de>
From: Gabriel Wicki <gabriel@erlikon.ch>
* gnu/packages/wm.scm (wlroots): Update to 0.16.1.
[arguments]: Add 'fix-meson-file phase to fix pnp.ids path.
[native-inputs]: Add hwdata:pnp.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
---
gnu/packages/wm.scm | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 985c1ac56b..2a5459e35a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -60,6 +60,8 @@
;;; Copyright © 2022 Fredrik Salomonsson <plattfot@posteo.net>
;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
+;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
+;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -131,6 +133,7 @@ (define-module (gnu packages wm)
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpd)
+ #:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -1539,7 +1542,7 @@ (define-public polybar
(define-public wlroots
(package
(name "wlroots")
- (version "0.15.1")
+ (version "0.16.1")
(source
(origin
(method git-fetch)
@@ -1548,7 +1551,7 @@ (define-public wlroots
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))
+ (base32 "11kcica9waj1a1xgbi12gif9z5z0b4xzycbcgawbgdmj77pws8sk"))))
(build-system meson-build-system)
(arguments
`(#:phases
@@ -1559,7 +1562,13 @@ (define-public wlroots
(("Xwayland") (string-append (assoc-ref inputs
"xorg-server-xwayland")
"/bin/Xwayland")))
- #t)))))
+ #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"))))))))
(propagated-inputs
(list ;; As required by wlroots.pc.
eudev
@@ -1574,7 +1583,9 @@ (define-public wlroots
xcb-util-wm
xorg-server-xwayland))
(native-inputs
- (list pkg-config))
+ (list
+ `(,hwdata "pnp")
+ pkg-config))
(home-page "https://github.com/swaywm/wlroots")
(synopsis "Pluggable, composable, unopinionated modules for building a
Wayland compositor")
--
2.39.2
next prev parent reply other threads:[~2023-04-06 9:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-06 23:17 [bug#61331] [PATCH core-updates] Update wayland, libdrm, wlroots, wayland-protocols-next, libinput, sway Gabriel Wicki
2023-02-06 23:21 ` [bug#61331] [PATCH core-updates] Update wayland, ..., sway Gabriel Wicki
2023-02-06 23:22 ` [bug#61331] (no subject) Gabriel Wicki
2023-02-06 23:26 ` [bug#61331] [PATCH 3/6] gnu: Update wlroots to 0.16.1 Gabriel Wicki
2023-02-06 23:26 ` [bug#61331] [PATCH 4/6] gnu: Update wayland-protocols-next to 1.31 Gabriel Wicki
2023-02-06 23:27 ` [bug#61331] [PATCH 5/6] gnu: Update libinput to 1.22.1 Gabriel Wicki
2023-02-06 23:29 ` [bug#61331] [PATCH 6/6] gnu: Update sway to 1.8 Gabriel Wicki
2023-02-07 5:16 ` [bug#61331] need update cagebreak too Feng Shu
2023-02-09 2:20 ` [bug#61331] Update " Feng Shu
2023-04-06 8:58 ` [bug#61331] [PATCH core-updates] Update wayland, libdrm, wlroots, wayland-protocols-next, libinput, sway Jonathan Brielmaier
2023-04-06 9:02 ` [bug#61331] [PATCH 1/4] gnu: Update libinput to 1.22.1 Jonathan Brielmaier
2023-04-06 9:02 ` Jonathan Brielmaier [this message]
2023-04-06 9:02 ` [bug#61331] [PATCH 3/4] gnu: sway: Update to 1.8 Jonathan Brielmaier
2023-04-06 9:02 ` [bug#61331] [PATCH 4/4] gnu: cagebreak: Update to 2.0.1 Jonathan Brielmaier
2023-04-06 11:19 ` tumashu
2023-04-07 12:25 ` bug#61331: [PATCH core-updates] Update wayland, libdrm, wlroots, wayland-protocols-next, libinput, sway Jonathan Brielmaier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230406090225.31969-2-jonathan.brielmaier@web.de \
--to=jonathan.brielmaier@web.de \
--cc=61331@debbugs.gnu.org \
--cc=gabriel@erlikon.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.