diff options
Diffstat (limited to 'gnu/packages/freedesktop.scm')
| -rw-r--r-- | gnu/packages/freedesktop.scm | 173 |
1 files changed, 66 insertions, 107 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 362c6b308b..78b459443a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -25,12 +25,13 @@ ;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> -;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be> +;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> -;;; Copyright © 2022 muradm <mail@muradm.net> +;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> +;;; Copyright © 2022 muradm <mail@muradm.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,7 +149,6 @@ (build-system meson-build-system) (arguments (list - #:meson meson-0.63 #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases @@ -263,15 +263,7 @@ application-centers for distributions.") ;; This test timeouts despite changing the value of ;; 'CK_DEFAULT_TIMEOUT' to 600 (see: ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20). - (("^\ttransmitter/nice.*") "")))) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (with-directory-excursion "docs" - (substitute* '("libs/farstream-libs-docs.sgml" - "plugins/farstream-plugins-docs.sgml") - (("http://www.oasis-open.org/docbook/xml/4.1.2/") - (search-input-directory (or native-inputs inputs) - "xml/dtd/docbook/"))))))))) + (("^\ttransmitter/nice.*") ""))))))) (native-inputs (list autoconf automake @@ -280,6 +272,7 @@ application-centers for distributions.") gobject-introspection gtk-doc/stable libtool + libxml2 ;for XML_CATALOG_FILES libxslt perl pkg-config @@ -563,14 +556,15 @@ freedesktop.org project.") ;; Updating this will rebuild over 700 packages through libinput-minimal. (package (name "libinput") - (version "1.19.4") + (version "1.22.1") (source (origin - (method url-fetch) - (uri (string-append "https://freedesktop.org/software/libinput/" - "libinput-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libinput/libinput.git") + (commit version))) (sha256 (base32 - "0h5lz54rrl48bhi3vki6s08m6rn2h62rlf08dhgchdm9nmqaaczz")))) + "17a5qlym2d6lg2j8fdpxda9k7x5zr35flb4wlj1bz7h0mnkh8326")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") @@ -704,6 +698,13 @@ the freedesktop.org XDG Base Directory specification.") (substitute* "meson.build" (("join_paths\\(bindir, 'pkttyagent'\\)") "'\"/run/current-system/profile/bin/pkttyagent\"'")))) + (add-after 'unpack 'use-global-hook-directory + ;; XXX There is no run-time setting to set this per-process, only a + ;; build-time, hard-coded list of global directories. + (lambda _ + (substitute* (list "src/login/elogind-dbus.c" + "src/sleep/sleep.c") + (("PKGSYSCONFDIR") "\"/etc/elogind\"")))) (add-after 'unpack 'adjust-tests (lambda _ ;; Skip the following test, which depends on users such as 'root' @@ -752,7 +753,7 @@ the freedesktop.org XDG Base Directory specification.") (substitute* "src/login/elogind.c" (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\""))))))) (native-inputs - `(("docbook-xml" ,docbook-xml) + `(("docbook-xml" ,docbook-xml-4.5) ("docbook-xml-4.2" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("gettext" ,gettext-minimal) @@ -968,7 +969,14 @@ with localed. This package is extracted from the broader systemd package.") ".tar.xz")) (sha256 (base32 - "09md23m4fw87x264mls1f5isrswk6iw7y9g4hr1nib008wbbk370")))) + "09md23m4fw87x264mls1f5isrswk6iw7y9g4hr1nib008wbbk370")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "contrib/meson.build" + (("bash_.*_dep\\.get_.*\\('completionsdir', .*\\)") + "join_paths(get_option('prefix'), 'share', + 'bash-completion', 'completions')")))))) (build-system meson-build-system) (arguments (list #:tests? #f @@ -1149,58 +1157,44 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) - (uri (string-append "https://wayland.freedesktop.org/releases/" + (uri (string-append "https://gitlab.freedesktop.org/" name + "/" name "/-/releases/" version "/downloads/" name "-" version ".tar.xz")) (sha256 (base32 - "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q")))) + "0hjq8b1cprxpxcv2klgir1hd63vy5hrqilp9v317394qlqgayh0m")))) (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 native-inputs inputs #:allow-other-keys) - (with-directory-excursion "doc" - (substitute* (find-files "." "\\.xml$") - (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref (or native-inputs inputs) - "docbook-xml") - "/xml/dtd/docbook/")) - (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref (or native-inputs inputs) - "docbook-xml-4.2") - "/xml/dtd/docbook/")))))) - (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")))))))) + (list #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda _ + (mkdir-p (string-append #$output:doc "/share")) + (rename-file + (string-append #$output "/share/doc") + (string-append #$output:doc "/share/doc"))))))) (native-inputs - `(("docbook-xml-4.2" ,docbook-xml-4.2) - ("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("dot" ,graphviz) - ("doxygen" ,doxygen) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("xmlto" ,xmlto) - ("xsltproc" ,libxslt) - ,@(if (%current-target-system) - `(("pkg-config-for-build" ,pkg-config-for-build) - ("wayland" ,this-package)) ; for wayland-scanner - '()))) - (inputs - (list expat libxml2)) ; for XML_CATALOG_FILES - (propagated-inputs - (list libffi)) + (append + (list docbook-xml-4.2 + docbook-xml-4.5 + docbook-xsl + graphviz + doxygen + pkg-config + python + xmlto + libxslt) + (if (%current-target-system) + (list pkg-config-for-build + this-package) ;for wayland-scanner + '()))) + (inputs (list expat libxml2)) ;for XML_CATALOG_FILES + (propagated-inputs (list libffi)) (home-page "https://wayland.freedesktop.org/") (synopsis "Core Wayland window system code and protocol") (description "Wayland is a project to define a protocol for a compositor to @@ -1214,15 +1208,15 @@ fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.23") + (version "1.29") (source (origin (method url-fetch) - (uri (string-append - "https://wayland.freedesktop.org/releases/" - "wayland-protocols-" version ".tar.xz")) + (uri (string-append "https://gitlab.freedesktop.org/wayland/" + name "/-/releases/" version "/downloads/" + name "-" version ".tar.xz")) (sha256 (base32 - "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc")))) + "1n4yzyjbp5fng8pvckandymvwc47mkwyi4pyvr6p0dn7bavrlpp2")))) (build-system meson-build-system) (inputs (list wayland)) @@ -1242,20 +1236,6 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") . "https://wayland.freedesktop.org/releases.html"))) (license license:expat))) -(define-public wayland-protocols-next - (package - (inherit wayland-protocols) - (name "wayland-protocols") - (version "1.26") - (source (origin - (method url-fetch) - (uri (string-append - "https://wayland.freedesktop.org/releases/" - "wayland-protocols-" version ".tar.xz")) - (sha256 - (base32 - "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5")))))) - (define-public wayland-utils (package (name "wayland-utils") @@ -1271,7 +1251,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") "04k1yhyh7h4xawbhpz9pf6cpfmmp1l862fdgsvvnyp4hg9n3j9aj")))) (build-system meson-build-system) (native-inputs (list pkg-config)) - (inputs (list libdrm wayland wayland-protocols-next)) + (inputs (list libdrm wayland wayland-protocols)) (home-page "https://wayland.freedesktop.org/") (synopsis "Display information about the Wayland protocols") (description "This package provides @code{wayland-info} tool that can be @@ -1348,7 +1328,7 @@ compositor.") linux-pam pango pipewire - wayland-protocols-next + wayland-protocols xorg-server-xwayland)) (propagated-inputs (list libxkbcommon pixman wayland)) @@ -1644,15 +1624,6 @@ message bus.") "-Dsystemdsystemunitdir=/tmp/empty") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-docbook-references - ;; Having XML_CATALOG_FILES set is not enough; xmlto does not seem - ;; to honor it. - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "\\.xml(\\.in)?$") - (("http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd") - (search-input-file inputs "share/xml/dbus-1/introspect.dtd")) - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (search-input-file inputs "xml/dtd/docbook/docbookx.dtd"))))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "meson_post_install.py" @@ -2085,9 +2056,7 @@ iChat interoperability, and multi-user chats and Tubes using the pkg-config vala)) (inputs - ;; TODO: remove pango-next after it's the default. - (list gtk+ - pango-next)) + (list gtk+)) (propagated-inputs ;; colord-gtk.pc refers to all these. (list colord gtk)) @@ -2547,23 +2516,13 @@ Its features include: (add-after 'unpack 'make-reproducible (lambda _ (substitute* "src/main.c" - (("__DATE__") "\"guix\"")))) - (add-before 'configure 'fix-docbook - (lambda _ - (substitute* "docs/Makefile.in" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append #$(this-package-native-input "docbook-xsl") - "/xml/xsl/docbook-xsl-" - #$(package-version (this-package-native-input "docbook-xsl")) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append #$(this-package-native-input "docbook-xml") - "/xml/dtd/docbook/catalog.xml"))))))) + (("__DATE__") "\"guix\""))))))) (inputs (list glib pango libdrm libpng eudev)) (native-inputs (list gettext-minimal pkg-config + libxml2 ;for XML_CATALOG_FILES libxslt docbook-xsl docbook-xml)) |