From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bug-guix-bounces+larch=yhetil.org@gnu.org>
Received: from mp1 ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms0.migadu.com with LMTPS
	id KBDhHaBglmF35QAAgWs5BA
	(envelope-from <bug-guix-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Thu, 18 Nov 2021 15:18:08 +0100
Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1 with LMTPS
	id wOt2GaBglmFsTAAAbx9fmQ
	(envelope-from <bug-guix-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Thu, 18 Nov 2021 14:18:08 +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 1ABFFDCB4
	for <larch@yhetil.org>; Thu, 18 Nov 2021 15:18:08 +0100 (CET)
Received: from localhost ([::1]:50412 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <bug-guix-bounces+larch=yhetil.org@gnu.org>)
	id 1mniEp-0005H4-Ax
	for larch@yhetil.org; Thu, 18 Nov 2021 09:18:07 -0500
Received: from eggs.gnu.org ([209.51.188.92]:41948)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1mniDr-0003OB-VN
 for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:08 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:51989)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1mniDr-0001yM-MZ
 for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:07 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1mniDr-0000fV-Gs
 for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:07 -0500
X-Loop: help-debbugs@gnu.org
Subject: bug#51900: [PATCH 08/11] gnu: xorg-server-xwayland: Update to 21.1.3
 and adjust package.
Resent-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-guix@gnu.org
Resent-Date: Thu, 18 Nov 2021 14:17:07 +0000
Resent-Message-ID: <handler.51900.B51900.16372450121728@debbugs.gnu.org>
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.16372450121728
 (code B ref 51900); Thu, 18 Nov 2021 14:17:07 +0000
Received: (at 51900) by debbugs.gnu.org; 18 Nov 2021 14:16:52 +0000
Received: from localhost ([127.0.0.1]:35290 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1mniDb-0000RO-AN
 for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:16:51 -0500
Received: from mail-qv1-f48.google.com ([209.85.219.48]:43742)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@gmail.com>) id 1mniDU-0000IC-GI
 for 51900@debbugs.gnu.org; Thu, 18 Nov 2021 09:16:45 -0500
Received: by mail-qv1-f48.google.com with SMTP id j9so4628399qvm.10
 for <51900@debbugs.gnu.org>; Thu, 18 Nov 2021 06:16:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=rrSiiIncbUhrKbAPltcqAy3rwvHvqtbeuYT9y96f6HA=;
 b=MWuxFZYINYhtgu4Ql6qthJBx7sO8NWJPaLHKCv6plJJIoAiGQ8nXba0RRJVcvEBvcu
 dN8ZZq1KdzlOghW8Q5qHyEhvCvEbKhKZljs3kk9nhBFe2lKbjTdqQf0Q5MKx4cG2HhQr
 1vtbrZauWwQGtjLp1stkHES5m1NESx3mOavwRp/COv44tVKIx3lKQ4hMewuQHHIe189P
 qR7cllz8sFepB3DibYreO8BinscR7K0tfcE3iTRtWMlJh/r1UQbIyKUQsrUQQkfHhxsT
 wlXYKXWwx7g1TBQPZ9IBuVTIgcCqe+rq5VTUJaFlKxkxfrDCiqKQQwY3M37hSsZaRbzd
 iyNg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=rrSiiIncbUhrKbAPltcqAy3rwvHvqtbeuYT9y96f6HA=;
 b=e1GcPvQpxfYO5W+y2zWNpQBDzd7lp+pqxKqFPmZiEdpL29MtbG03gUoEplI1H2nAGt
 bHGRancu6IDgXQiOvpAp74FlwoRkn+eCM5EUdItzYcFHFGEQuvLVT7zjsEbWIRXyBxXx
 Loh15Gj6rYl9r6/Umlr7mbUoMPsKz45znWrKL0LV/hcdfpInZkIjCF2LmiPTOjdxEnog
 xYkQ8IRc3tGPFNIOnkIqkiixZNI3xeiXU5FmXYy57riLv7EIuHRARpohy8HhURglmy6h
 xeVOvGnzwU+LE8YG1jiHazzG+q2pWCNf/GGV4z64qqucU1mSjIFI3LH3pANma5THZPEJ
 vBTg==
X-Gm-Message-State: AOAM533QC+dHScSBkSstxn+7E68oO3esdwiUpp6zkTRwggxyIbvaucCK
 LVf4+2GG1uPf5im7VncRTe87QdHBeUxeJA==
X-Google-Smtp-Source: ABdhPJzpouMuOJTW7TI8cddWsPwqIaDe+kVRXTigaxj2TiFd8HIbAIcMl83b5CfRFFVh4Bw8SrYrFA==
X-Received: by 2002:a05:6214:caf:: with SMTP id
 s15mr63286253qvs.33.1637244998905; 
 Thu, 18 Nov 2021 06:16:38 -0800 (PST)
Received: from localhost.localdomain (dsl-10-133-135.b2b2c.ca. [72.10.133.135])
 by smtp.gmail.com with ESMTPSA id h22sm1655780qkk.14.2021.11.18.06.16.38
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 18 Nov 2021 06:16:38 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 18 Nov 2021 09:16:13 -0500
Message-Id: <20211118141616.4252-8-maxim.cournoyer@gmail.com>
X-Mailer: git-send-email 2.33.1
In-Reply-To: <20211118141616.4252-1-maxim.cournoyer@gmail.com>
References: <20211118141616.4252-1-maxim.cournoyer@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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 <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=subscribe>
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+larch=yhetil.org@gnu.org>
X-Migadu-Flow: FLOW_IN
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1637245088;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding: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=rrSiiIncbUhrKbAPltcqAy3rwvHvqtbeuYT9y96f6HA=;
	b=ZUVH9PLdBRoqbMpeIYsImztllcUxR1BMnIPk+I7RWnyXYZoaI6Cv9YZdVLmSuGy3TOSniR
	YMuKT23kQ+mEGrp2VklfpUlQQQVyXgjiff+kCnGq62m/sLAUhgSYarIse8SUpbcyTK7JeW
	6w1RPmL3YgBqmGGBT2UvbN1Pvl2+jbsJKcLJakoBPbg6ujRY/XYOAhG1ga/dayYlqZgk5K
	0d+vRaRx0OvWD9Lfr5Uci3bR6hJZub4eLf+kOJq0tBiOJw7TLMS91v+qJvzWlszJyTN8OP
	DzDsbZUcL7mnjfWaIBzTokmsA8go7jlKTEVx3edlw0jLt6VfZO/45eywuU7ByQ==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637245088; a=rsa-sha256; cv=none;
	b=BW0+noFF4ePV9LijFfmGGSdDtZPNCfLtqy2x3WE8cemxNDdw4YwbQTWWqDknSVi9q/slwO
	ygrel0yKLAdrtU5ffwg3/YjY2T44pdZ/vwQFTVs5rdzM1DbDHeGQlGEpvNz8JgFHidfy78
	p2reHhniwUryReaCH3YaF0xOwKPOXyqi7wEQl7l4ziTaq+ItIoBQtrxZWD8PMYF5Q2/rnG
	oakeoguIrh2tmVHO10yDn3ck9HYgJfsIowaYJfDbFmUtZPPbz50aoJ4TpmJM6becVdYA6E
	QVaCVd2G0eRtioVeL3pYcnuiGHjDeZXFT8uMZkM9uN2P2zwBrN+F8QNvHbNBQA==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=MWuxFZYI;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none);
	spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org
X-Migadu-Spam-Score: 2.24
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=MWuxFZYI;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none);
	spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org
X-Migadu-Queue-Id: 1ABFFDCB4
X-Spam-Score: 2.24
X-Migadu-Scanner: scn1.migadu.com
X-TUID: /JFGGls2TqkB

Xwayland is no longer part of the main X server distribution and now requires
Meson to build.  This change also turn on EGL support, which was previously
disabled.

* gnu/packages/xorg.scm (xorg-server-xwayland): Do not inherit from
xorg-server.  Update to 21.1.3.
[native-inputs]: New field.
[build-system]: Likewise.
[inputs]: Fully specify inputs, which are a subset of those of xorg-server.
[configure-flags]: Adjust for Meson.
[phases]{patch-/bin/sh}: New phase.
[description, home-page, license]: New fields.
---
 gnu/packages/xorg.scm | 74 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cb391f8549..6fa5f2fae7 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
@@ -87,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)
@@ -5604,21 +5606,67 @@ (define-public egl-wayland
     (license license:expat)))
 
 (define-public xorg-server-xwayland
-  (package/inherit xorg-server
+  (package
     (name "xorg-server-xwayland")
-    (inputs
-     `(("wayland" ,wayland)
-       ("wayland-protocols" ,wayland-protocols)
-       ,@(package-inputs xorg-server)))
+    (version "21.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://xorg.freedesktop.org/archive/individual"
+                           "/xserver/xwayland-" version ".tar.xz"))
+       (sha256
+        (base32
+         "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb"))))
+    (inputs (list font-dejavu
+                  dbus
+                  egl-wayland
+                  eudev
+                  libfontenc
+                  libdrm
+                  libepoxy
+                  libgcrypt
+                  libtirpc
+                  libxfont2
+                  libxkbfile
+                  pixman
+                  wayland
+                  wayland-protocols
+                  xkbcomp
+                  xkeyboard-config
+                  xorgproto
+                  xtrans))
+    (native-inputs (list pkg-config))
+    (build-system meson-build-system)
     (arguments
-     (substitute-keyword-arguments (package-arguments xorg-server)
-       ((#:configure-flags flags)
-        `(cons* "--enable-xwayland" "--disable-xorg"
-                "--disable-docs"    "--disable-devel-docs"
-                "--disable-xvfb"    "--disable-xnest"
-                "--disable-xquartz" "--disable-xwin"
-                ,flags))))
-    (synopsis "Xorg server with wayland backend")))
+     `(#:configure-flags
+       (list "-Dxwayland_eglstream=true"
+             (string-append "-Dxkb_dir="
+                            (assoc-ref %build-inputs "xkeyboard-config")
+                            "/share/X11/xkb")
+             (string-append "-Dxkb_bin_dir="
+                            (assoc-ref %build-inputs "xkbcomp") "/bin")
+             ;; The build system insist on providing a default font path; give
+             ;; that of dejavu, the same used for our fontconfig package.
+             (string-append "-Ddefault_font_path="
+                            (assoc-ref %build-inputs "font-dejavu")
+                            "/share/fonts")
+             "-Dxkb_output_dir=/tmp"
+             (format #f "-Dbuilder_string=\"Build ID: ~a ~a\"" ,name ,version)
+             "-Dxcsecurity=true"
+             "-Ddri3=true"
+             "-Dglamor=true"
+             ;; For the log file, etc.
+             "--localstatedir=/var")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'patch-/bin/sh
+                    (lambda _
+                      (substitute* (find-files "." "\\.c$")
+                        (("/bin/sh") (which "sh"))))))))
+    (synopsis "Xorg server with Wayland backend")
+    (description "Xwayland is an X server for running X clients under
+Wayland.")
+    (home-page "https://www.x.org/wiki/")
+    (license license:x11)))
 
 
 ;; packages of height 4 in the propagated-inputs tree
-- 
2.33.1