GNU bug report logs - #68146
[PATCH 0/3] Update labwc, wlroots, and shuffle some deps around

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Ahmad Draidi <a.r.draidi@HIDDEN>; Keywords: patch; dated Sat, 30 Dec 2023 13:28:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 68146 <at> debbugs.gnu.org:


Received: (at 68146) by debbugs.gnu.org; 30 Dec 2023 13:30:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 30 08:30:52 2023
Received: from localhost ([127.0.0.1]:43305 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rJZQR-00075G-P3
	for submit <at> 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 <a.r.draidi@HIDDEN>) id 1rJZQO-0006rB-OO
 for 68146 <at> 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 <a.r.draidi@HIDDEN>
To: 68146 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: labwc: Update to 0.7.0.
Date: Sat, 30 Dec 2023 17:28:48 +0400
Message-ID: <de05cb176863b317b4851787e9e5badb5a09e795.1703942286.git.a.r.draidi@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1703942286.git.a.r.draidi@HIDDEN>
References: <cover.1703942286.git.a.r.draidi@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: ( <paren@HIDDEN>, Christopher Baines <guix@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Raghav Gururajan <rg@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, jgart <jgart@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68146
Cc: Ahmad Draidi <a.r.draidi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Information forwarded to , guix-patches@HIDDEN:
bug#68146; Package guix-patches. Full text available.

Message received at 68146 <at> debbugs.gnu.org:


Received: (at 68146) by debbugs.gnu.org; 30 Dec 2023 13:30:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 30 08:30:51 2023
Received: from localhost ([127.0.0.1]:43303 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rJZQQ-00073a-VH
	for submit <at> 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 <a.r.draidi@HIDDEN>) id 1rJZQL-0006l3-1A
 for 68146 <at> 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 <a.r.draidi@HIDDEN>
To: 68146 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu: Update wlroots to 0.17.1.
Date: Sat, 30 Dec 2023 17:28:47 +0400
Message-ID: <4d7939be4ca5c4d293590e74578a5765a5cdac06.1703942286.git.a.r.draidi@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1703942286.git.a.r.draidi@HIDDEN>
References: <cover.1703942286.git.a.r.draidi@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: ( <paren@HIDDEN>, Christopher Baines <guix@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Raghav Gururajan <rg@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, jgart <jgart@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68146
Cc: Ahmad Draidi <a.r.draidi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <vesselwave@HIDDEN>
 ;;; Copyright © 2023 Nicolas Graves <ngraves@HIDDEN>
 ;;; Copyright © 2023 Jaeme Sifat <jaeme@HIDDEN>
+;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@HIDDEN>
 ;;;
 ;;; 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





Information forwarded to , guix-patches@HIDDEN:
bug#68146; Package guix-patches. Full text available.

Message received at 68146 <at> debbugs.gnu.org:


Received: (at 68146) by debbugs.gnu.org; 30 Dec 2023 13:30:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 30 08:30:46 2023
Received: from localhost ([127.0.0.1]:43299 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rJZQM-0006w5-C8
	for submit <at> 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 <a.r.draidi@HIDDEN>) id 1rJZQJ-0006fH-IA
 for 68146 <at> 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 <a.r.draidi@HIDDEN>
To: 68146 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: Add libdisplay-info.
Date: Sat, 30 Dec 2023 17:28:46 +0400
Message-ID: <955298d0cd8d6fb1ade9984cfe2dde234d64f6c9.1703942286.git.a.r.draidi@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1703942286.git.a.r.draidi@HIDDEN>
References: <cover.1703942286.git.a.r.draidi@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: ( <paren@HIDDEN>, Christopher Baines <guix@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Raghav Gururajan <rg@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, jgart <jgart@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 68146
Cc: Ahmad Draidi <a.r.draidi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <phodina@HIDDEN>
 ;;; Copyright © 2022 muradm <mail@HIDDEN>
 ;;; Copyright © 2023 Alex Devaure <ajadevaure@HIDDEN>
+;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@HIDDEN>
 ;;;
 ;;; 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





Information forwarded to , guix-patches@HIDDEN:
bug#68146; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 30 Dec 2023 13:27:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 30 08:27:05 2023
Received: from localhost ([127.0.0.1]:43284 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rJZMm-00057L-Ue
	for submit <at> 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 <a.r.draidi@HIDDEN>) id 1rJZMi-00056o-QM
 for submit <at> 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 <a.r.draidi@HIDDEN>)
 id 1rJZMb-0003Bg-0d
 for guix-patches@HIDDEN; 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 <a.r.draidi@HIDDEN>)
 id 1rJZMY-00064s-QU
 for guix-patches@HIDDEN; 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 <a.r.draidi@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/3] Update labwc, wlroots, and shuffle some deps around
Date: Sat, 30 Dec 2023 17:21:59 +0400
Message-ID: <cover.1703942286.git.a.r.draidi@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: ( <paren@HIDDEN>, Christopher Baines <guix@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Raghav Gururajan <rg@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, jgart <jgart@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=103.105.48.212;
 envelope-from=a.r.draidi@HIDDEN; 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 <a.r.draidi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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





Acknowledgement sent to Ahmad Draidi <a.r.draidi@HIDDEN>:
New bug report received and forwarded. Copy sent to , guix-patches@HIDDEN. Full text available.
Report forwarded to , guix-patches@HIDDEN:
bug#68146; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sat, 20 Jan 2024 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.