From 878744c5e3be6165633ead99c0efdca88abfcaea Mon Sep 17 00:00:00 2001 From: Artem Chernyak Date: Mon, 18 Oct 2021 16:32:38 +0200 Subject: gnu: udiskie: Update to 2.3.3. * gnu/packages/patches/udiskie-no-appindicator.patch: Remove file. * gnu/local.mk: Remove it. * gnu/packages/freedesktop.scm (udiskie): Update to 2.3.3. [source]: Remove udiskie-no-appindicator patch. [inputs]: Add libindicator. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/freedesktop.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 514125977b..a002e3e807 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1998,17 +1998,14 @@ Python, that binds to the C library @code{uchardet} to increase performance.") (define-public udiskie (package (name "udiskie") - (version "2.1.0") + (version "2.3.3") (source (origin (method url-fetch) (uri (pypi-uri "udiskie" version)) (sha256 (base32 - "0smib8vbs9q37n7ynhzyw97q16fgdkcdw7fw69lci0xvyq00v1dz")) - ;; Remove support for the libappindicator library of the - ;; Unity desktop environment which is not in Guix. - (patches (search-patches "udiskie-no-appindicator.patch")))) + "0sagdmsc5km32h3jvgj843p8bicrrgfz26qhl04ibxmas6725zr0")))) (build-system python-build-system) (native-inputs `(("asciidoc" ,asciidoc) @@ -2017,6 +2014,7 @@ Python, that binds to the C library @code{uchardet} to increase performance.") (inputs `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) + ("libappindicator" ,libappindicator) ("libnotify" ,libnotify) ("udisks" ,udisks))) (propagated-inputs -- cgit v1.2.3 From 2be79191e0358130548f31c68d684e89a6e4b978 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:07:58 -0400 Subject: gnu: libportal: Update to 0.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (libportal): Update to 0.4. Signed-off-by: Ludovic Courtès --- gnu/packages/freedesktop.scm | 81 +++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 42 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a002e3e807..25660b8f85 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Robby Zambito +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -2240,48 +2241,44 @@ fallback to generic Systray support if none of those are available.") (license license:lgpl2.1+))) (define-public libportal - (let ((commit "bff3289") - (revision "1")) - (package - (name "libportal") - (version (git-version "0.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flatpak/libportal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "104b91qircr1i9jkmm6f725awywky52aimrki303kiaadn2v8b5i")))) - (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html "/share/gtk-doc")) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) - #t)))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc/stable) - ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) - ("libxml2" ,libxml2) - ("glib:bin" ,glib "bin"))) - (propagated-inputs - `(("glib" ,glib))) - (outputs '("out" "doc")) - (home-page "https://github.com/flatpak/libportal") - (synopsis "Flatpak portal library") - (description - "libportal provides GIO-style async APIs for most Flatpak portals.") - (license license:lgpl2.1+)))) + (package + (name "libportal") + (version "0.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/flatpak/libportal/releases/download/" + version "/libportal-" version ".tar.xz")) + (sha256 + (base32 + "0a7gmhyf0b58xy335jyf524g1fyc2id4r88anhvg47430w4zbm9w")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html "/share/gtk-doc")) + (copy-recursively (string-append out html) + (string-append doc html)) + (delete-file-recursively (string-append out html)) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("gtk-doc" ,gtk-doc/stable) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml) + ("libxml2" ,libxml2) + ("glib:bin" ,glib "bin"))) + (propagated-inputs + `(("glib" ,glib))) + (outputs '("out" "doc")) + (home-page "https://github.com/flatpak/libportal") + (synopsis "Flatpak portal library") + (description + "libportal provides GIO-style async APIs for most Flatpak portals.") + (license license:lgpl2.1+))) (define-public xdg-desktop-portal (package -- cgit v1.2.3 From 419a778e4679b63b456ec6fad5ca88f120ed9d60 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:12:00 -0400 Subject: gnu: xdg-desktop-portal: Update to 1.10.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.10.1. Signed-off-by: Ludovic Courtès --- gnu/packages/freedesktop.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 25660b8f85..966de38d6e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2283,16 +2283,15 @@ fallback to generic Systray support if none of those are available.") (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.8.1") + (version "1.10.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flatpak/xdg-desktop-portal") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/flatpak/xdg-desktop-portal/releases/download/" + version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "0pq0kmvzk56my396vh97pzw4wizwmlmzvv2kr2xv047x3044mr5n")))) + "199lqr2plsy9qqnxx5a381ml8ygcbz4nkjla5pvljjcrwzlqsygd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 7c5a4025f5191f98b3b52c59f563eb2b0415c356 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:12:29 -0400 Subject: gnu: xdg-desktop-portal-gtk: Update to 1.10.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (xdg-desktop-portal-gtk): Update to 1.10.0. [arguments]: Adjust configure-flags for Gnome backends in new version (defaults to disabled in this version) Signed-off-by: Ludovic Courtès --- gnu/packages/freedesktop.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 966de38d6e..e6c7266b1e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2342,16 +2342,15 @@ and others.") (define-public xdg-desktop-portal-gtk (package (name "xdg-desktop-portal-gtk") - (version "1.7.1") + (version "1.10.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flatpak/xdg-desktop-portal-gtk") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/" + version "/xdg-desktop-portal-gtk-" version ".tar.xz")) (sha256 (base32 - "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird")))) + "0nlbnd6qvs92fanrmmn123vy0y2ml0v3ndxyk5x0cpfbnmxpa2f8")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -2362,7 +2361,16 @@ and others.") (for-each (lambda (po) (chmod po #o666)) (find-files "po" "\\.po$")) - #t))))) + #t))) + ;; Enable Gnome portal backends + #:configure-flags + (list + "--enable-appchooser" + "--enable-wallpaper" + "--enable-screenshot" + "--enable-screencast" + "--enable-background" + "--enable-settings"))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From f52694e1d52754c53df3316c1ae9a793a33cfa55 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 15:18:36 -0400 Subject: gnu: xdg-desktop-portal-gtk: Propagate xdg-desktop-portal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (xdg-desktop-portal-gtk)[inputs]: Fix the runtime need for xdg-desktop-portal and XDG_DESKTOP_PORTAL_DIR being written twice. Move xdg-desktop-portal to ... [propagated-inputs]: ... here. Signed-off-by: Ludovic Courtès --- gnu/packages/freedesktop.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e6c7266b1e..e2a4a264e9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2376,7 +2376,6 @@ and others.") ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ("xdg-desktop-portal" ,xdg-desktop-portal) ("glib:bin" ,glib "bin") ("which" ,which) ("gettext" ,gettext-minimal))) @@ -2386,10 +2385,8 @@ and others.") ("fontconfig" ,fontconfig) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) - (native-search-paths - (list (search-path-specification - (variable "XDG_DESKTOP_PORTAL_DIR") - (files '("share/xdg-desktop-portal/portals"))))) + (propagated-inputs + `(("xdg-desktop-portal" ,xdg-desktop-portal))) (home-page "https://github.com/flatpak/xdg-desktop-portal-gtk") (synopsis "GTK implementation of xdg-desktop-portal") (description -- cgit v1.2.3 From d0850dbd345373fb7c78b2915e94a2f41983ea99 Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Tue, 19 Oct 2021 22:19:36 -0400 Subject: gnu: waypipe: Simplify 'fix-sleep-path phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (waypipe) [arguments]: Remove inputs argument. [native-inputs]: Remove coreutils. Signed-off-by: Ludovic Courtès --- gnu/packages/freedesktop.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e2a4a264e9..f824633ea2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2451,16 +2451,14 @@ compositors.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-sleep-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "./test/startup_failure.py" - (("sleep") (string-append coreutils "/bin/sleep"))))))))) + (lambda* (#:key #:allow-other-keys) + (substitute* "./test/startup_failure.py" + (("sleep") (which "sleep")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc) ;; For tests - ("python" ,python) - ("coreutils" ,coreutils))) + ("python" ,python))) (home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe") (synopsis "Proxy for Wayland protocol applications") (description -- cgit v1.2.3 From 91bb0955d9a769ed61e904465f0aa267dbae71bb Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Tue, 19 Oct 2021 22:19:37 -0400 Subject: gnu: waypipe: Update to 0.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (waypipe): Update to 0.8.1. [arguments]: Remove obsolete 'fix-sleep-path phase. Signed-off-by: Ludovic Courtès --- gnu/packages/freedesktop.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f824633ea2..bf4bce553b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2436,7 +2436,7 @@ compositors.") (define-public waypipe (package (name "waypipe") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -2445,15 +2445,8 @@ compositors.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qa47ljfvb1vv3h647xwn1j5j8gfmcmdfaz4j8ygnkvj36y87vnz")))) + (base32 "1v08dv3dfz420v51ahz7qgv3429073kmgrf8f66s4c3jlpch2pa1")))) (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-sleep-path - (lambda* (#:key #:allow-other-keys) - (substitute* "./test/startup_failure.py" - (("sleep") (which "sleep")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc) -- cgit v1.2.3