From patchwork Thu Aug 20 15:10:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 23724 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 10FFF27BBE6; Thu, 20 Aug 2020 16:28:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4981E27BBE5 for ; Thu, 20 Aug 2020 16:28:01 +0100 (BST) Received: from localhost ([::1]:58632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8mTw-0008OP-Py for patchwork@mira.cbaines.net; Thu, 20 Aug 2020 11:28:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mEW-0007FC-TK for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8mEW-000715-I7 for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8mEW-0006CK-Dh for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 20/29] gnu: wayland: Update package definition. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Aug 2020 15:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Cc: Raghav Gururajan , Danny Milosavljevic Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.159793628323621 (code B ref 42958); Thu, 20 Aug 2020 15:12:04 +0000 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:23 +0000 Received: from localhost ([127.0.0.1]:43492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDq-00068o-Ox for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:23 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00063R-QJ for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 02E9F33681E5; Thu, 20 Aug 2020 17:10:59 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 20 Aug 2020 17:10:41 +0200 Message-Id: <20200820151050.9529-20-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Raghav Gururajan * gnu/packages/freedesktop.scm (wayland) [version]: Update to 1.18.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to meson. [outputs]: New output "doc". [arguments]<#:parallel-tests?>: Remove argument. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Move here docbook-xml and docbook-xsl from ... [inputs]: ... here. Move libffi to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Change from x11 to expat. Signed-off-by: Danny Milosavljevic --- gnu/packages/freedesktop.scm | 87 +++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 25 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 23cd1aabf9..880c006e15 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -637,38 +637,75 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.17.0") - (source (origin - (method url-fetch) - (uri (string-append "https://wayland.freedesktop.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj")))) - (build-system gnu-build-system) + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://wayland.freedesktop.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6")))) + (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:parallel-tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* '("man/wl_display_connect.xml" + "publican/sources/Architecture.xml" + "publican/sources/Author_Group.xml" + "publican/sources/Book_Info.xml" + "publican/sources/Client.xml" + "publican/sources/Compositors.xml" + "publican/sources/Foreword.xml" + "publican/sources/Introduction.xml" + "publican/sources/Preface.xml" + "publican/sources/Protocol.xml" + "publican/sources/Server.xml" + "publican/sources/Wayland.xml" + "publican/sources/Xwayland.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))) + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config) ("xmlto" ,xmlto) ("xsltproc" ,libxslt))) (inputs - `(("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("expat" ,expat) - ("libffi" ,libffi) - ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES + `(("expat" ,expat) + ("libxml2" ,libxml2))) + (propagated-inputs + `(("libffi" ,libffi))) + (synopsis "Core Wayland window system code and protocol") + (description "Wayland is a project to define a protocol for a compositor to +talk to its clients as well as a library implementation of the protocol. The +compositor can be a standalone display server running on Linux kernel +modesetting and evdev input devices, an X application, or a wayland client +itself. The clients can be traditional applications, X servers (rootless or +fullscreen) or other display servers.") (home-page "https://wayland.freedesktop.org/") - (synopsis "Display server protocol") - (description - "Wayland is a protocol for a compositor to talk to its clients as well as -a C library implementation of that protocol. The compositor can be a standalone -display server running on Linux kernel modesetting and evdev input devices, an X -application, or a wayland client itself. The clients can be traditional -applications, X servers (rootless or fullscreen) or other display servers.") - (license license:x11))) + (license license:expat))) (define-public wayland-protocols (package