[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42958] [PATCH core-updates 20/29] gnu: wayland: Update package defi
From: |
Danny Milosavljevic |
Subject: |
[bug#42958] [PATCH core-updates 20/29] gnu: wayland: Update package definition. |
Date: |
Thu, 20 Aug 2020 17:10:41 +0200 |
From: Raghav Gururajan <raghavgururajan@disroot.org>
* 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 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
- [bug#42958] [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0., (continued)
- [bug#42958] [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 22/29] gnu: atkmm: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 08/29] gnu: pixman: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 24/29] gnu: json-glib: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 25/29] gnu: at-spi2-core: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 28/29] gnu: gtk+: Propagate libcloudproviders., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 20/29] gnu: wayland: Update package definition.,
Danny Milosavljevic <=
- [bug#42958] [PATCH core-updates 19/29] gnu: gtk+-2: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches back., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 29/29] gnu: gtk+: Add missing input., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 15/29] gnu: vala: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 27/29] gnu: gtk+: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 13/29] gnu: gdk-pixbuf: Disable failing tests., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 21/29] gnu: wayland-protocols: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 14/29] gnu: gdk-pixbuf+svg: Update package definition., Danny Milosavljevic, 2020/08/20
- [bug#42958] [PATCH core-updates 11/29] gnu: pango: Update package definition., Danny Milosavljevic, 2020/08/20