From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OCQdGKkWlWHCFgEAgWs5BA (envelope-from ) for ; Wed, 17 Nov 2021 15:50:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id AFKkE6kWlWFvJwAAbx9fmQ (envelope-from ) for ; Wed, 17 Nov 2021 14:50:17 +0000 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 8EFFDECF0 for ; Wed, 17 Nov 2021 15:50:16 +0100 (CET) Received: from localhost ([::1]:32998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnMGN-0006Y3-KC for larch@yhetil.org; Wed, 17 Nov 2021 09:50:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnMGA-0006VQ-J9 for bug-guix@gnu.org; Wed, 17 Nov 2021 09:50:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnMGA-00010G-Ax for bug-guix@gnu.org; Wed, 17 Nov 2021 09:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnMGA-0005lC-89 for bug-guix@gnu.org; Wed, 17 Nov 2021 09:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51900: [core-updates-frozen] xorg-server-xwayland broken Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 17 Nov 2021 14:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51900 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51900@debbugs.gnu.org Received: via spool by 51900-submit@debbugs.gnu.org id=B51900.163716055122044 (code B ref 51900); Wed, 17 Nov 2021 14:50:02 +0000 Received: (at 51900) by debbugs.gnu.org; 17 Nov 2021 14:49:11 +0000 Received: from localhost ([127.0.0.1]:60598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnMFF-0005jE-Nb for submit@debbugs.gnu.org; Wed, 17 Nov 2021 09:49:11 -0500 Received: from mout02.posteo.de ([185.67.36.66]:56727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnMFA-0005ib-Is for 51900@debbugs.gnu.org; Wed, 17 Nov 2021 09:49:04 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E14F1240104 for <51900@debbugs.gnu.org>; Wed, 17 Nov 2021 15:48:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1637160533; bh=1Cz6OvFPRhTBYskQzsdC5ym7wrMKicla5uvTLgny6Ag=; h=From:To:Subject:Date:From; b=HfnJkIU1VIXFMwCm7Ct9Y2GXTC6ylBY3pvsbyalNL029qEDOLzXwn12A77Geinq2D DazpNu/siF0gFrR81vQyWOA12eFXCt9m7nEuaS687gHHWjLmGTpTsgN/tI/vu0Boro rnru4nMJZ0D4dC9maJ0iq4L71WWgPGPEuEI0UaqekEwMh8PVErJgxNwmxht9SkpNLv W4AoBbCqtipTtg8q7fWWL/EsoeYaZGVwyt4pjQWQ0EvuEOY8Zb1vMcI0qZGRctIdIu L4QwiDG83niaHaLAp/OoPKWfQtjSiholrh+SXp21nqMMsI2eneX6absfEw6avO0g+2 LZh8J8dn5tuLw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HvQmN3ph2z6tm6 for <51900@debbugs.gnu.org>; Wed, 17 Nov 2021 15:48:52 +0100 (CET) References: <87sfvvdatg.fsf@kitej> From: Guillaume Le Vaillant Date: Wed, 17 Nov 2021 14:36:15 +0000 In-reply-to: <87sfvvdatg.fsf@kitej> Message-ID: <87ilwqvnvw.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637160616; 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: dkim-signature; bh=2r2HL/Etoc0dCmp50VudPzNHSasgw5gBfz+75k1VSIo=; b=RtevM3SgpsuZHbrR1oz3v9ktS+s+ZB0WdQPZVwqFPuXLjL2mUpTHg3XBRzxaikTGUaIYtG /RL+ZDAWBnpp7cllBpOxTrWPHZlN2p/EAE8DaPC5ck4C6BVrAzEmH2IudPsE+cGLyHqVRx AKIl52PNTVpa4JUaug99LZ8YHM4MUyjXrq0v3kS8TVTZ7VuF+jpec12f0Cevy2pZsHzMTQ 52Yd//cLwjSrQE1SGGVRwKK1b/nNPIh5/4iHZb1zJj3RmqiPU5pbkIzzeo9k3KMAiIzg/Y WeyraS3sqAUgRJo3t/P/vxa6JgyY0i7CExjwooqD14QlNSxvsIATdKe/ScMXCQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637160616; a=rsa-sha256; cv=none; b=dhDgWm9+UhyQalyphKspxBP7pkMmUo94uicfe6WjhBBSHVmByCVmDmYxfwWr0pPpKSonMq 1Z3dFgKnqDn5FVlyvVOZQGOupXPe1zJL8Ub4iScAEg4Eiy0Nv3sLJBYHpY4/kmPx1kj5Vk tPF0TNw0mYU62eMBTwTd7lRI67MiTKEDnyYOvI2yYKLX+sV6UwORZuMpca+RAiUcUUludS mG8/aEdkMfxfIjDaXeu5vOLkeQ0Z4WyFhnBvz+qmaqae1tDLb0Yn85Y8mD4ok2WitbQILJ eYsRA3Tuxq4AQ3M7UQBYQpAfNJKkksVwnNm3CB1esveQUY1+mdM5Quviq+MhSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=HfnJkIU1; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=HfnJkIU1; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8EFFDECF0 X-Spam-Score: -3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: Lmv9K/d/xtnR --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable According to [1], since 21.1 series of Xorg, XWayland is packaged separately. The attached patch replaces xorg-xserver-xwayland by the xwayland package. However it looks like it's not working so far, the tests fail with: =2D-8<---------------cut here---------------start------------->8--- XKB: Failed to compile keymap Keyboard initialization failed. This could be a missing or incorrect setup = of xkeyboard-config. (EE)=20 Fatal server error: (EE) Failed to activate virtual core keyboard: 2(EE) =2D-8<---------------cut here---------------end--------------->8--- I tried adding the same keyboard-related parameters as the ones in xorg-server (xbk_dir and xkb_bin_dir), but it doesn't seem to make a difference. Does someone have an idea? [1] https://lists.x.org/archives/xorg/2021-October/060799.html --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-WIP-gnu-Replace-xorg-server-xwayland-by-xwayland.patch Content-Transfer-Encoding: quoted-printable From=20457921b36c49c68e58ac067ede50637ce71a200c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 17 Nov 2021 15:20:34 +0100 Subject: [PATCH] WIP: gnu: Replace xorg-server-xwayland by xwayland. * gnu/packages/xorg.scm (xorg-server-xwayland): Remove varable. (xwayland): New variable. * gnu/packages/enlightenment.scm (enlightenment)[inputs]: Replace xorg-server-xwayland by xwayland. * gnu/packages/freedesktop.scm (weston)[inputs, arguments]: Idem. * gnu/packages/gnome.scm (mutter)[inputs, arguments]: Idem. * gnu/packages/wm.scm (wlroots)[inputs, arguments]: Idem. =2D-- gnu/packages/enlightenment.scm | 2 +- gnu/packages/freedesktop.scm | 4 +-- gnu/packages/gnome.scm | 4 +-- gnu/packages/wm.scm | 5 ++- gnu/packages/xorg.scm | 63 +++++++++++++++++++++++++++------- 5 files changed, 57 insertions(+), 21 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 8c7da4a5b4..9b3fcfabaa 100644 =2D-- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -369,7 +369,7 @@ (define-public enlightenment ("setxkbmap" ,setxkbmap) ("xcb-util-keysyms" ,xcb-util-keysyms) ("xkeyboard-config" ,xkeyboard-config) =2D ("xorg-server-xwayland" ,xorg-server-xwayland))) + ("xwayland" ,xwayland))) (propagated-inputs `(("efl" ,efl) ("libxkbcommon" ,libxkbcommon) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 003da5c7a5..7511b2014c 100644 =2D-- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1147,7 +1147,7 @@ (define-public weston ("pango" ,pango) ("pipewire" ,pipewire) ("wayland-protocols" ,wayland-protocols) =2D ("xorg-server-xwayland" ,xorg-server-xwayland))) + ("xwayland" ,xwayland))) (propagated-inputs `(("libxkbcommon" ,libxkbcommon) ("pixman" ,pixman) @@ -1164,7 +1164,7 @@ (define-public weston "-Dbackend-default=3Dauto" "-Dsystemd=3Dfalse" (string-append "-Dxwayland-path=3D" =2D (assoc-ref %build-inputs "xorg-server-xwayland") + (assoc-ref %build-inputs "xwayland") "/bin/Xwayland")) #:parallel-tests? #f ; Parallel tests cause failures. #:phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 39ab43c90c..73af9eddd9 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7507,7 +7507,7 @@ (define-public mutter =20 ;; The following flags are needed for the bundled clutter (string-append "-Dxwayland_path=3D" =2D (assoc-ref %build-inputs "xorg-server-xwayla= nd") + (assoc-ref %build-inputs "xwayland") "/bin/Xwayland") =20 ;; the remaining flags are needed for the bundled cogl @@ -7572,7 +7572,7 @@ (define-public mutter ("startup-notification" ,startup-notification) ("upower-glib" ,upower) ("xkeyboard-config" ,xkeyboard-config) =2D ("xorg-server-xwayland" ,xorg-server-xwayland) + ("xwayland" ,xwayland) ("zenity" ,zenity))) (synopsis "Window and compositing manager") (home-page "https://www.gnome.org") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e19a08da47..b746d68485 100644 =2D-- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1486,8 +1486,7 @@ (define-public wlroots (add-before 'configure 'hardcode-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "xwayland/server.c" =2D (("Xwayland") (string-append (assoc-ref inputs =2D "xorg-server-xway= land") + (("Xwayland") (string-append (assoc-ref inputs "xwayland") "/bin/Xwayland"))) #t))))) (propagated-inputs @@ -1503,7 +1502,7 @@ (define-public wlroots ("wayland-protocols" ,wayland-protocols) ("xcb-util-errors" ,xcb-util-errors) ("xcb-util-wm" ,xcb-util-wm) =2D ("xorg-server-xwayland" ,xorg-server-xwayland))) + ("xwayland" ,xwayland))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/swaywm/wlroots") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 574562f065..e387474990 100644 =2D-- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -32,6 +32,7 @@ ;;; Copyright =C2=A9 2021 Matthew James Kraai ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 qblade +;;; Copyright =C2=A9 2021 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ (define-module (gnu packages xorg) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages inkscape) @@ -86,6 +88,7 @@ (define-module (gnu packages xorg) #:use-module (gnu packages llvm) #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pciutils) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) @@ -5518,22 +5521,56 @@ (define-public xorg-server-for-tests (package (inherit xorg-server)))) =20 =2D(define-public xorg-server-xwayland =2D (package/inherit xorg-server =2D (name "xorg-server-xwayland") +(define-public xwayland + (package + (name "xwayland") + (version "21.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://xorg.freedesktop.org/archive/individua= l" + "/xserver/xwayland-" version ".tar.xz")) + (sha256 + (base32 "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb")))) + (build-system meson-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs =2D `(("wayland" ,wayland) + `(("egl-wayland" ,egl-wayland) + ("font-util" ,font-util) + ("libbsd" ,libbsd) + ("libdrm" ,libdrm) + ("libepoxy" ,libepoxy) + ("libgcrypt" ,libgcrypt) + ("libtirpc" ,libtirpc) + ("libx11" ,libx11) + ("libxfont2" ,libxfont2) + ("libxkbfile" ,libxkbfile) + ("libxshmfence" ,libxshmfence) + ("pixman" ,pixman) + ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) =2D ,@(package-inputs xorg-server))) + ("xkbcomp" ,xkbcomp) + ("xkeyboard-config" ,xkeyboard-config) + ("xorgproto" ,xorgproto) + ("xtrans" ,xtrans))) (arguments =2D (substitute-keyword-arguments (package-arguments xorg-server) =2D ((#:configure-flags flags) =2D `(cons* "--enable-xwayland" "--disable-xorg" =2D "--disable-docs" "--disable-devel-docs" =2D "--disable-xvfb" "--disable-xnest" =2D "--disable-xquartz" "--disable-xwin" =2D ,flags)))) =2D (synopsis "Xorg server with wayland backend"))) + `(#:tests? #f ; FIXME + #:configure-flags + (list (string-append "-Dxkb_dir=3D" + (assoc-ref %build-inputs "xkeyboard-config") + "/share/X11/xkb") + "-Dxkb_output_dir=3D/tmp" + (string-append "-Dxkb_bin_dir=3D" + (assoc-ref %build-inputs "xkbcomp") + "/bin") + "-Ddefault_font_path=3D"))) + (home-page "https://wayland.freedesktop.org/xserver.html") + (synopsis "X server with Wayland backend") + (description + "XWayland is an X server running on Wayland to provide backwards +compatibility for legacy X11 applications.") + (license license:x11))) =20 =20 ;; packages of height 4 in the propagated-inputs tree =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYZUWUw8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j98kAEAhb93jupsg/1k/NDOQTJApg94dtJKOvc8ee7W STH1MMUBAIageVK/SQysjIFH8YxPQmh+l3fTZ2ClgI71L9PMmMas =BpO0 -----END PGP SIGNATURE----- --==-=-=--