[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
316/334: gnu: wayland: Update package definition.
From: |
guix-commits |
Subject: |
316/334: gnu: wayland: Update package definition. |
Date: |
Sat, 15 Aug 2020 16:27:46 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit bc920c26befe42031d2682a5a7a7c1cb0a35d1fd
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Sun Aug 9 07:16:35 2020 -0400
gnu: wayland: Update package definition.
* gnu/packages/freedesktop.scm (wayland) [version]: Update to 1.18.0.
[source]<origin>[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 <dannym@scratchpost.org>
---
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 56cb26d..d986e7a 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -757,38 +757,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
- 321/334: gnu: gjs: Update package definition., (continued)
- 321/334: gnu: gjs: Update package definition., guix-commits, 2020/08/15
- 323/334: gnu: gdm: Update package definition., guix-commits, 2020/08/15
- 324/334: gnu: gnome-shell: Update package definition., guix-commits, 2020/08/15
- 325/334: build-system/glib-or-gtk: Include GI_TYPELIB_PATH in wrapper., guix-commits, 2020/08/15
- 327/334: build-system/python: Also wrap executables that are in "libexec"., guix-commits, 2020/08/15
- 329/334: build-system/cmake: Wrap Python executables, too., guix-commits, 2020/08/15
- 330/334: gnu: gnome: Revise package definition., guix-commits, 2020/08/15
- 306/334: gnu: Add latex2html., guix-commits, 2020/08/15
- 310/334: gnu: gst-editing-services: Update package definition., guix-commits, 2020/08/15
- 314/334: gnu: sushi: Update package definition., guix-commits, 2020/08/15
- 316/334: gnu: wayland: Update package definition.,
guix-commits <=
- 322/334: gnu: mutter: Update package definition., guix-commits, 2020/08/15
- 334/334: build-system/cmake: Only include phases that are enabled., guix-commits, 2020/08/15
- 225/334: gnu: gtksourceview: Fix glade., guix-commits, 2020/08/15
- 257/334: gnu: rust-cssparser-macros@0.6.0: Fix reference to rust-proc-macro2., guix-commits, 2020/08/15
- 278/334: gnu: librsvg: Remove duplicate "delete-file-recursively" call., guix-commits, 2020/08/15
- 283/334: gnu: Add fuse@2.9.9., guix-commits, 2020/08/15
- 284/334: gnu: libostree: Update package definition., guix-commits, 2020/08/15
- 286/334: gnu: malcontent: Update package definition., guix-commits, 2020/08/15
- 288/334: gnu: gnome-keyring: Update package definition., guix-commits, 2020/08/15
- 291/334: gnu: gnome-music: Update package definition., guix-commits, 2020/08/15