X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/23c6be1d3dfb4c6fa6170d7fff348e82f379a0ba..a46dc35893a8c24b9b0e747ba2856b71fb16fe38:/gnu/packages/gnome.scm diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1aaffe0b00..f7ceb10a81 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016, 2020 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -9,7 +9,7 @@ ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver +;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Rene Saavedra @@ -58,6 +58,8 @@ ;;; Copyright © 2020 Tim Gesthuizen ;;; Copyright © 2020, 2021 Andy Tai ;;; Copyright © 2020, 2021 Sébastien Lerique +;;; Copyright © 2021 Trevor Hass +;;; Copyright © 2021 Solene Rapenne ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,6 +127,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages ibus) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) @@ -166,6 +169,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -200,7 +204,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) - #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -214,8 +217,6 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix gexp) - #:use-module (guix monads) - #:use-module (guix store) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -262,7 +263,7 @@ ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -365,7 +366,7 @@ features to enable users to create their discs easily and quickly.") (native-inputs `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -391,7 +392,9 @@ services.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7")))) + (base32 "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7")) + (patches + (search-patches "libgrss-CVE-2016-2001.patch")))) (build-system glib-or-gtk-build-system) (outputs '("out" "doc")) (arguments @@ -414,7 +417,7 @@ services.") (native-inputs `(("docbook-xml" ,docbook-xml-4.1.2) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -511,7 +514,7 @@ bindings.") ("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) @@ -621,7 +624,7 @@ It is written in C using GObject and libsoup.") "/share/gtk-doc/html")))) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib))) @@ -691,7 +694,7 @@ of writing test cases for asynchronous interactions.") ("dbus-test-runner" ,dbus-test-runner) ("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ;; Would only be required by configure flag "--enable-extended-tests". ;("gtx" ,gtx) ("pkg-config" ,pkg-config) @@ -767,7 +770,7 @@ of known objects without needing a central registrar.") ("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("vala" ,vala) @@ -1109,7 +1112,7 @@ freedesktop.org desktop notification specification.") (define-public mm-common (package (name "mm-common") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/mm-common/" @@ -1117,10 +1120,11 @@ freedesktop.org desktop notification specification.") "mm-common-" version ".tar.xz")) (sha256 (base32 - "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2")))) + "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8")))) (build-system meson-build-system) (arguments - `(#:phases + `(#:meson ,meson-0.55 + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch (lambda* (#:key inputs #:allow-other-keys) @@ -1165,18 +1169,25 @@ Library reference documentation.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-udev-rules-directory + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules (string-append out "/lib/udev/rules.d"))) + (substitute* "data/meson.build" + (("udev\\.get_pkgconfig_variable\\('udevdir'\\)") + (format #f "'~a'" rules)))))) (add-before 'check 'start-virtual-dir-server ;; The same server when started by tests/virtual-dir returns an ;; unexpected status (4 instead of 200) and fails a test. It is ;; unclear why starting it manually here makes it pass. (lambda _ - (system "tests/virtual-dir-server &") - #t))))) + (system "tests/virtual-dir-server &")))))) (native-inputs `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("avahi" ,avahi) @@ -1294,7 +1305,7 @@ It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1325,13 +1336,18 @@ a debugging tool, @command{gssdp-device-sniffer}.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs - `(("gssdp" ,gssdp) + ;; gsettings-desktop-schemas for org.gnome.system.proxy + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gssdp" ,gssdp) ("gtk+" ,gtk+) ("libsoup" ,libsoup))) + (propagated-inputs + `(;; For ‘org.gnome.system.proxy’. + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (synopsis "PnP API for GNOME") (description "This package provides GUPnP, an object-oriented framework for creating UPnP devices and control points, written in C using @@ -1356,7 +1372,7 @@ for creating UPnP devices and control points, written in C using `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml" ,libxml2) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -1390,7 +1406,7 @@ given profile, etc. DLNA is a subset of UPnP A/V.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml" ,libxml2) ("pkg-config" ,pkg-config))) (inputs @@ -1405,7 +1421,7 @@ and implementation of UPnP A/V profiles.") (define-public libmediaart (package (name "libmediaart") - (version "1.9.4") + (version "1.9.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1413,8 +1429,10 @@ and implementation of UPnP A/V profiles.") name "-" version ".tar.xz")) (sha256 (base32 - "0gc10imyabk57ar54m0qzms0x9dnmkymhkzyk8w1aj3y4lby0yx5")))) - (build-system gnu-build-system) + "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7")))) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-next)) (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) @@ -1606,7 +1624,7 @@ preview files on the GNOME desktop.") (native-inputs `(("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1668,7 +1686,7 @@ client devices can handle.") `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -1974,7 +1992,7 @@ access the common Google services, and has full asynchronous support.") (define-public libgxps (package (name "libgxps") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1982,7 +2000,7 @@ access the common Google services, and has full asynchronous support.") name "-" version ".tar.xz")) (sha256 (base32 - "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs")))) + "07156nj7yrp3h9zyzx6mjwxwmfijialb4gi5d6dwyp53arr8c9vd")))) (build-system meson-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) @@ -2416,7 +2434,7 @@ GNOME Desktop.") ("automake" ,automake) ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("gnome-common" ,gnome-common) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("libtool" ,libtool) @@ -2433,8 +2451,7 @@ GNOME Desktop.") ;;; A minimal variant used to break a cycle with Inkscape. (define-public gdl-minimal - (package - (inherit gdl) + (package/inherit gdl (name "gdl-minimal") (arguments '(#:phases @@ -2718,7 +2735,7 @@ and how they are displayed (View).") (define-public gtg (package (name "gtg") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -2727,7 +2744,7 @@ and how they are displayed (View).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0r28vyr88rj3kd3cg4gj7sd29wadjchi92wzmbx67d4hlg25h8kk")))) + (base32 "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -2754,10 +2771,13 @@ and how they are displayed (View).") ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs - `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + `(("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) + ("pango" ,pango) ("python-dbus" ,python-dbus) ("python-liblarch" ,python-liblarch) + ("python-lxml" ,python-lxml) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-pyxdg" ,python-pyxdg))) @@ -3057,7 +3077,7 @@ configuring CUPS.") ("gobject-introspection" ,gobject-introspection) ;; For the documentation. - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("xsltproc" ,libxslt) ("docbook-xsl" ,docbook-xsl))) (home-page "https://developer-next.gnome.org/libnotify/") @@ -3224,6 +3244,7 @@ the GNOME desktop environment.") (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "libcroco-CVE-2020-12825.patch")) (sha256 (base32 "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) @@ -3354,7 +3375,7 @@ library.") (define-public librsvg-next (package (name "librsvg") - (version "2.50.2") + (version "2.50.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3362,7 +3383,7 @@ library.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "1lsnl08b5pjf01q3agixjd53islw5rqkc38r31rlmm2crrqz44b2")) + "0n79i4wj9hm0d3bbn4xvknq5ylhqs16pvhaqr1rxspx9wfc8lad4")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "vendor") @@ -3370,7 +3391,8 @@ library.") (build-system cargo-build-system) (outputs '("out" "doc")) (arguments - `(#:modules + `(#:install-source? #f + #:modules ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) @@ -3417,7 +3439,7 @@ library.") ("rust-chrono" ,rust-chrono-0.4) ("rust-criterion" ,rust-criterion-0.3) ("rust-float-cmp" ,rust-float-cmp-0.8) - ("rust-lopdf" ,rust-lopdf-0.25) + ("rust-lopdf" ,rust-lopdf-0.26) ("rust-png" ,rust-png-0.16) ("rust-predicates" ,rust-predicates-1) ("rust-tempfile" ,rust-tempfile-3)) @@ -4117,14 +4139,14 @@ Hints specification (EWMH).") (define-public goffice (package (name "goffice") - (version "0.10.48") + (version "0.10.50") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/goffice/" (version-major+minor version) "/" "goffice-" version ".tar.xz")) (sha256 - (base32 "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4")))) + (base32 "1p5zbj7cbcfcxd6l8pnph54p6ah1bwf146y810j4bcq8ggf3sp1c")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 4.0 MiB of gtk-doc @@ -4181,7 +4203,7 @@ Hints specification (EWMH).") (define-public gnumeric (package (name "gnumeric") - (version "1.12.48") + (version "1.12.50") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnumeric/" @@ -4189,7 +4211,7 @@ Hints specification (EWMH).") "gnumeric-" version ".tar.xz")) (sha256 (base32 - "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p")))) + "1f0lrj5msg80pgjp38jj6rddf352gwddgip7z4lki66n3fx1k23m")))) (build-system glib-or-gtk-build-system) (arguments `(;; The gnumeric developers don't worry much about failing tests. @@ -4239,6 +4261,57 @@ engineering.") ;; Dual licensed under GPLv2 or GPLv3 (both without "or later") (list license:gpl2 license:gpl3)))) +(define-public drawing + (package + (name "drawing") + (version "0.8.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/maoschanz/drawing") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lpszd8276rp5chn84rkvwmnflxc3pqlg4cz53gfxkqdb3gn02zz")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/drawing")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("pango" ,pango) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject))) + (home-page "https://maoschanz.github.io/drawing/") + (synopsis "Basic image editor for GNOME") + (description + "Drawing is a basic image editor aiming at the GNOME desktop.") + (license license:gpl3+))) + (define-public gnome-themes-standard (package (name "gnome-themes-standard") @@ -4435,7 +4508,7 @@ editors, IDEs, etc.") "0rnm5c6m3abbm81jsfdas0y80z299ny54gr4syn4bfrms3s4g19l")))) (build-system meson-build-system) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gtk-doc" ,gtk-doc/stable) ,@(package-native-inputs vte))) (arguments `(#:configure-flags '("-Ddocs=true"))) @@ -4552,7 +4625,7 @@ and RDP protocols.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (arguments @@ -4629,7 +4702,7 @@ and objects.") `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("which" ,which) ("autoconf" ,autoconf) @@ -4852,7 +4925,7 @@ libxml to ease remote use of the RESTful API.") `(("docbook-xml" ,docbook-xml-4.1.2) ("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -4862,17 +4935,18 @@ libxml to ease remote use of the RESTful API.") ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) (propagated-inputs - ;; libsoup-2.4.pc refers to all these. + ;; libsoup-2.4.pc refers to all of these (except where otherwise noted) `(("brotli" ,google-brotli) ("glib" ,glib) + ("glib-networking" ,glib-networking) ; for GIO runtime modules ("libpsl" ,libpsl) ("libxml2" ,libxml2) ("sqlite" ,sqlite) ("zlib" ,zlib))) (inputs - `(("glib-networking" ,glib-networking) - ("mit-krb5" ,mit-krb5))) - (home-page "https://live.gnome.org/LibSoup/") + `(("mit-krb5" ,mit-krb5) + ("ntlm_auth" ,samba))) ; For ntlm_auth support + (home-page "https://wiki.gnome.org/Projects/libsoup") (synopsis "GLib-based HTTP Library") (description "LibSoup is an HTTP client/server library for GNOME. It uses GObjects @@ -4882,8 +4956,7 @@ and the GLib main loop, to integrate well with GNOME applications.") ;;; A minimal version of libsoup used to prevent a cycle with Inkscape. (define-public libsoup-minimal - (package - (inherit libsoup) + (package/inherit libsoup (name "libsoup-minimal") (outputs (delete "doc" (package-outputs libsoup))) (arguments @@ -5220,7 +5293,7 @@ keyboard shortcuts.") `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs @@ -5265,7 +5338,7 @@ output devices.") ("gobject-introspection" ,gobject-introspection) ("modem-manager" ,modem-manager) ("libnotify" ,libnotify) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool))) (inputs `(("avahi" ,avahi) @@ -5310,7 +5383,7 @@ permission from user.") ("glibc-locales" ,glibc-locales) ; for tests ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("json-glib" ,json-glib))) (propagated-inputs @@ -5330,28 +5403,33 @@ faster results and to avoid unnecessary server load.") (define-public upower (package (name "upower") - (version "0.99.11") - (source (origin - (method url-fetch) - (uri (string-append "https://upower.freedesktop.org/releases/" - "upower-" version ".tar.xz")) - (sha256 - (base32 - "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4")) - (patches (search-patches "upower-builddir.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Upstream commit - ;; - ;; moved 'dbus-1/system.d' from etc/ to share/. However, - ;; 'dbus-configuration-directory' in (gnu services dbus) - ;; expects it in etc/. Thus, move it back to its previous - ;; location. - (substitute* "src/Makefile.in" - (("^dbusconfdir =.*$") - "dbusconfdir = $(sysconfdir)/dbus-1/system.d\n")) - #t)))) + (version "0.99.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/upower/upower") + (commit (string-append "UPOWER_" + (string-map (match-lambda (#\. #\_) + (chr chr)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00q63yc8vp5cq05vhpwq3qglapdm8hg0lrqkzdwkphk30qzb6hv6")) + (patches (search-patches "upower-builddir.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Upstream commit + ;; + ;; moved 'dbus-1/system.d' from etc/ to share/. However, + ;; 'dbus-configuration-directory' in (gnu services dbus) + ;; expects it in etc/. Thus, move it back to its previous + ;; location. + (substitute* "src/Makefile.am" + (("^dbusconfdir =.*$") + "dbusconfdir = $(sysconfdir)/dbus-1/system.d\n")) + #t)))) (build-system glib-or-gtk-build-system) (arguments '(#:phases @@ -5367,10 +5445,15 @@ faster results and to avoid unnecessary server load.") (assoc-ref %outputs "out") "/lib/udev/rules.d")))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) ("python" ,python) + ("which" ,which) ; for ./autogen.sh ;; For tests. ("python-dbus" ,python-dbus) @@ -5379,9 +5462,9 @@ faster results and to avoid unnecessary server load.") ("umockdev" ,umockdev) ;; For man pages. - ("libxslt" ,libxslt) ;for 'xsltproc' - ("libxml2" ,libxml2) ;for 'XML_CATALOG_FILES' - ("docbook-xsl" ,docbook-xsl))) + ("docbook-xsl" ,docbook-xsl) + ("libxslt" ,libxslt) ; for 'xsltproc' + ("libxml2" ,libxml2))) ; for 'XML_CATALOG_FILES' (inputs `(("dbus-glib" ,dbus-glib) ("libgudev" ,libgudev) @@ -5530,7 +5613,7 @@ settings, themes, mouse settings, and startup of other daemons.") (define-public totem-pl-parser (package (name "totem-pl-parser") - (version "3.26.5") + (version "3.26.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/totem-pl-parser/" @@ -5538,7 +5621,7 @@ settings, themes, mouse settings, and startup of other daemons.") "totem-pl-parser-" version ".tar.xz")) (sha256 (base32 - "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k")))) + "075csd5x0frgf93jvhlqiwv5i0qm24zz3iw17jj7v7fgsml0zpy0")))) (build-system meson-build-system) (arguments ;; FIXME: Tests require gvfs. @@ -5616,7 +5699,7 @@ which are easy to play with the aid of a mouse.") (native-inputs `(("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") ; for glib-mkenums - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -5938,7 +6021,7 @@ queries upon that data.") (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.4.4") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgnome-games-support/" @@ -5946,16 +6029,17 @@ queries upon that data.") "libgnome-games-support-" version ".tar.xz")) (sha256 (base32 - "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq")))) - (build-system gnu-build-system) + "11g1r3ppb9v8m3anks9gxf7fv1x38vmjiya3lr7zjjv328pb69d6")))) + (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a writable HOME. - (setenv "HOME" (getcwd)) - #t))))) + '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a writable HOME. + (setenv "HOME" (getcwd)) + #t))))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config) @@ -6033,7 +6117,7 @@ as possible!") ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("vala" ,vala))) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -6106,7 +6190,7 @@ discovery protocols.") (define-public totem (package (name "totem") - (version "3.38.0") + (version "3.38.1") (source (origin (method url-fetch) @@ -6114,8 +6198,7 @@ discovery protocols.") (version-major+minor version) "/" "totem-" version ".tar.xz")) (sha256 - (base32 - "0bs33ijvxbr2prb9yj4dxglsszslsn9k258n311sld84masz4ad8")))) + (base32 "02510lvzvxvmpcs64k6sqix8ysl7sihhhwvp0vmfv7521ryczylg")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -6176,14 +6259,6 @@ discovery protocols.") (substitute* "meson_post_install.py" (("gtk-update-icon-cache") "true")) #t)) - (add-after 'unpack 'patch-failing-test - (lambda _ - ;; Work around test failure with GStreamer 1.18, because the test - ;; relies on "und" not being mapped to a particular language: - ;; https://gitlab.gnome.org/GNOME/totem/-/issues/450 - (substitute* "src/test-totem.c" - (("und") "nosuchlang")) - #t)) (add-before 'install 'disable-cache-generation (lambda _ @@ -6412,25 +6487,22 @@ side panel; (define-public libgudev (package (name "libgudev") - (version "232") + (version "236") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0q3qki451zzgdjazlgshsfzbbm0in40lyx7dyrag7kbkqnwv4k7f")))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags - ;; umockdev depends on libgudev. - (list "--disable-umockdev"))) + "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("glib" ,glib))) ; required by gudev-1.0.pc + `(("glib" ,glib) ; in Requires of gudev-1.0.pc + ("eudev" ,eudev))) ; in Requires.private of gudev-1.0.pc (inputs `(("udev" ,eudev))) (home-page "https://wiki.gnome.org/Projects/libgudev") @@ -6443,7 +6515,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.40.1") + (version "1.40.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gvfs/" @@ -6451,7 +6523,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") "gvfs-" version ".tar.xz")) (sha256 (base32 - "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj")) + "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx")) ;; This patch may be removed when upgrading to version 1.46.x. (patches (search-patches "gvfs-add-support-for-libplist-2.2.patch")))) @@ -6467,7 +6539,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs @@ -6498,6 +6570,10 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) + ;; CVE-2019-{12447,12448,12449} are fixed in the 1.40.2 release. + (properties '((lint-hidden-cve . ("CVE-2019-12447" + "CVE-2019-12448" + "CVE-2019-12449")))) (home-page "https://wiki.gnome.org/gvfs/") (synopsis "Userspace virtual file system for GIO") (description @@ -6528,7 +6604,7 @@ DAV, and others.") `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala) - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (propagated-inputs ;; Both of these are required by gusb.pc. `(("glib" ,glib) @@ -6641,9 +6717,11 @@ almost all of them.") ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) ("python-pycrypto" ,python-pycrypto) + ("libhandy" ,libhandy) ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gnome-settings-daemon" ,gnome-settings-daemon) ; desktop-schemas are not enough ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") @@ -6928,7 +7006,7 @@ classes for commonly used data structures.") (define-public gexiv2 (package (name "gexiv2") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6936,7 +7014,7 @@ classes for commonly used data structures.") name "-" version ".tar.xz")) (sha256 (base32 - "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla")))) + "0k4ljzzz5dwqndw8awvlw3ala8rh3b2rk9i4jzvywc53mi9ba8i3")))) (build-system meson-build-system) (native-inputs `(("gcr" ,gcr) @@ -6960,7 +7038,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.30.11") + (version "0.30.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/shotwell/" @@ -6968,7 +7046,7 @@ metadata in photo and video files of various formats.") "shotwell-" version ".tar.xz")) (sha256 (base32 - "12d26y40kjlv5x8f5g04wff33vh7mdjb8c41ydqbrwdip0jwy2n2")))) + "1h5crjq59lqi8f8mdkadzi8pc3i9i2ik4lsx2nrhzq486fzdfhw6")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -7479,7 +7557,9 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (version-major+minor version) "/" name "-" version ".tar.xz")) (patches (search-patches "evolution-data-server-locales.patch" - "evolution-data-server-libical-compat.patch")) + "evolution-data-server-libical-compat.patch" + "evolution-data-server-CVE-2020-14928.patch" + "evolution-data-server-CVE-2020-16117.patch")) (sha256 (base32 "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y")))) @@ -7729,7 +7809,7 @@ users.") `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("docbook-xml" ,docbook-xml) ("docbook-xsl" ,docbook-xsl) @@ -7986,7 +8066,7 @@ Cisco's AnyConnect SSL VPN.") `(("intltool" ,intltool) ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs ;; libnm-gtk.pc refers to all these. @@ -8422,7 +8502,7 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "3.34.2") + (version "3.34.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8430,8 +8510,9 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh")) - (patches (search-patches "gnome-shell-theme.patch" + "0l3mdn7g2c22mdhrqkxvvc1pk2w0v32f2v4a6n1phvaalwcg75nj")) + (patches (search-patches "gnome-shell-CVE-2020-17489.patch" + "gnome-shell-theme.patch" "gnome-shell-disable-test.patch")) (modules '((guix build utils))) (snippet @@ -8573,6 +8654,9 @@ properties, screen resolution, and other GNOME parameters.") ;; Missing propagation? See also: ("librsvg" ,librsvg) ("geoclue" ,geoclue))) + ;; CVE-2019-3820 was fixed before GNOME 3.34 was released, in upstream + ;; commit f0a7395b3006360905ccdc642982f9fc67378927. + (properties '((lint-hidden-cve . ("CVE-2019-3820")))) (synopsis "Desktop shell for GNOME") (home-page "https://wiki.gnome.org/Projects/GnomeShell") (description @@ -8629,7 +8713,7 @@ core C library, and bindings for Python (PyGTK).") (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.2.4") + (version "0.3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8637,7 +8721,7 @@ core C library, and bindings for Python (PyGTK).") name "-" version ".tar.xz")) (sha256 (base32 - "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a")))) + "012w7rhhpxvlrnnhqy01vwzg1wxqpy8jbqgizn47wnip7bvh0917")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) @@ -9029,7 +9113,7 @@ associations for GNOME.") (define-public libgovirt (package (name "libgovirt") - (version "0.3.6") + (version "0.3.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9037,7 +9121,7 @@ associations for GNOME.") name "-" version ".tar.xz")) (sha256 (base32 - "19pb71pag3vsi83kbv8h08kimwym4hpw36kjl6a5ik5nk50mc8sg")))) + "1y0x1wyakj3ya33hgj0w1jkbcn50q21gmn2zyalxysqp55i1ij8x")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -9730,7 +9814,7 @@ compiled.") "--enable-introspection"))) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ;; The 0.2.4 ‘release’ tarball isn't bootstrapped. @@ -9802,7 +9886,7 @@ environment, which can notably display keyboard layouts.") `(("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (propagated-inputs ;; Referred to in .h files and .pc. `(("gtk+" ,gtk+))) @@ -10072,8 +10156,7 @@ accessibility infrastructure.") (properties '((upstream-name . "pyatspi"))))) (define-public python2-pyatspi - (package - (inherit python-pyatspi) + (package/inherit python-pyatspi (name "python2-pyatspi") (inputs `(("python" ,python-2))) @@ -10388,7 +10471,7 @@ photo-booth-like software, such as Cheese.") ("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("itstool" ,itstool) ("libxml2" ,libxml2) ("libxslt" ,libxslt) @@ -10422,7 +10505,7 @@ apply fancy special effects and lets you share the fun with others.") (define-public passwordsafe (package (name "passwordsafe") - (version "3.99.2") + (version "5.0") (source (origin (method git-fetch) @@ -10431,7 +10514,7 @@ apply fancy special effects and lets you share the fun with others.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf")))) + (base32 "1xh64bbg10gnfzlck5jvqy2zk6hbk9cyqgv85xc9kbdvs8n4lhgh")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -10461,7 +10544,7 @@ apply fancy special effects and lets you share the fun with others.") `(("glib" ,glib) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) - ("libhandy" ,libhandy-0.0) + ("libhandy" ,libhandy) ("libpwquality" ,libpwquality) ("python-pygobject" ,python-pygobject) ("python-pykeepass" ,python-pykeepass))) @@ -10571,7 +10654,7 @@ configurable file renaming. ") (define-public workrave (package (name "workrave") - (version "1.10.42") + (version "1.10.43") (source (origin (method git-fetch) @@ -10582,7 +10665,7 @@ configurable file renaming. ") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "03i9kk8r1wgrfkkbwikx8wxaw4r4kn62vismr2zdq5g34fkkjh95")))) + (base32 "1baa9qjzd4b3q1zy5vhvyrx0hyz17mk237373ca48647897kw4cr")))) (build-system glib-or-gtk-build-system) (arguments ;; The only tests are maintainer tests (in po/), which fail. @@ -10709,7 +10792,8 @@ generic enough to work for everyone.") "evolution-" version ".tar.xz")) (sha256 (base32 - "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c")))) + "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c")) + (patches (search-patches "evolution-CVE-2020-11879.patch")))) (build-system cmake-build-system) (arguments `(#:imported-modules (,@%cmake-build-system-modules @@ -10772,7 +10856,7 @@ functionality.") (define-public gthumb (package (name "gthumb") - (version "3.8.2") + (version "3.10.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gthumb/" @@ -10780,7 +10864,7 @@ functionality.") "gthumb-" version ".tar.xz")) (sha256 (base32 - "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q")))) + "04n2sgasc03kiczyzkq362pjilj12hq2r5qj07lynqr9rivkzdys")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -10819,19 +10903,19 @@ advanced image management tool") (define-public terminator (package (name "terminator") - (version "1.92") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gnome-" name "/" name "/" - "releases/download/v" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z")))) + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/gnome-terminator/terminator/" + "releases/download/v" version "/" + name "-" version ".tar.gz")) + (sha256 + (base32 "0xdgmam7ghnxw6g38a4gjw3kk3rhga8c66lns18k928jlr9fmddw")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-compile-resources + ("glib:bin" ,glib "bin") ; for glib-compile-resources ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) @@ -10843,33 +10927,45 @@ advanced image management tool") ("dbus-glib" ,dbus-glib) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) + ("python" ,python-wrapper) + ("python-dbus" ,python-dbus) + ("python-notify2" ,python-notify2) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("vte" ,vte))) (propagated-inputs `(("python-configobj" ,python-configobj))) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) + ;; One test out of 28 fails due to dbus-python and python-notify; skip + ;; tests. + `(#:tests? #f + #:imported-modules ((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) #:modules ((guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) #:phases (modify-phases %standard-phases - (add-after - 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/terminator")) - (pylib (string-append (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) - (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) - #t))) + (add-after 'unpack 'handle-dbus-python + (lambda _ + ;; python-dbus cannot be found but it's really there. See + ;; https://github.com/SpotlightKid/jack-select/issues/2 + (substitute* "setup.py" + (("'dbus-python',") "")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/terminator")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t))) (add-after 'wrap-program 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://gnome-terminator.org/") @@ -10882,7 +10978,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (define-public libhandy (package (name "libhandy") - (version "1.0.3") + (version "1.2.2") (source (origin (method git-fetch) @@ -10891,7 +10987,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0flgwlm921801i3ns0dwqpnxl89f3rzn4y9h723i13bmflch3in7")))) + (base32 "0345x7gif6yjm95y62lww71lj84wfwsr2p32r3iww8shavb8scyk")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -10913,7 +11009,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ; for g-ir-scanner ("vala" ,vala) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) @@ -11159,7 +11255,7 @@ index files needed for Adwaita to be used outside of GNOME.") (define-public gnote (package (name "gnote") - (version "3.38.0") + (version "3.38.1") (source (origin (method url-fetch) @@ -11167,7 +11263,7 @@ index files needed for Adwaita to be used outside of GNOME.") (version-major+minor version) "/" "gnote-" version ".tar.xz")) (sha256 - (base32 "1ingbaw4d8vpjn083xvzqw7kz8z0k2bx7msk78pbzd68bwgkadpx")))) + (base32 "1adjfjhmsm2d33999khjyzvli6kiz1jlzavn77jhd49kfzhxa9y4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) @@ -11320,7 +11416,8 @@ these services on the Guix System.") (file-name (git-file-name name version)) (sha256 (base32 - "01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7")))) + "01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7")) + (patches (search-patches "geary-CVE-2020-24661.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -11447,7 +11544,7 @@ card sheets that you’ll find at most office supply stores.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) @@ -11529,6 +11626,69 @@ and toolbars.") GTK+. It integrates well with the GNOME desktop environment.") (license license:gpl3+))) +(define-public apostrophe + (package + (name "apostrophe") + (version "2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/somas/apostrophe") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-meson + (lambda _ + (substitute* "build-aux/meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/apostrophe")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) + `("PATH" prefix (,(string-append (assoc-ref inputs "pandoc") + "/bin")))) + #t)))))) + (inputs + `(("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("gspell" ,gspell) + ("gtk+" ,gtk+) + ("libhandy" ,libhandy) + ("pandoc" ,pandoc) + ("python-chardet" ,python-chardet) + ("python-levenshtein" ,python-levenshtein) + ("python-regex" ,python-regex) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyenchant" ,python-pyenchant) + ("python-pypandoc" ,python-pypandoc) + ("webkitgtk" ,webkitgtk))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (home-page "https://gitlab.gnome.org/somas/apostrophe") + (synopsis "Markdown editor written in Python with GTK+") + (description "Apostrophe is a GTK+ based distraction free Markdown editor. +It uses pandoc as back-end for parsing Markdown.") + (license license:gpl3))) + (define-public libratbag (package (name "libratbag") @@ -11910,7 +12070,7 @@ integrated profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.26.1") + (version "0.29.2") (source (origin (method git-fetch) @@ -11920,7 +12080,7 @@ integrated profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "1mas409c14p6g0v10w4cf5hsjbs0922h6h9k9pyj9s8y7yi2ikz2")))) + "0g1whk0y3k1cy6ix20gz226ww1vzpb9hinn5d24z6j38mdgqqa5l")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -11952,6 +12112,8 @@ integrated profiler via Sysprof, debugging support, and more.") ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-brotli" ,python-brotli) + ("python-cloudscraper" ,python-cloudscraper) ("python-dateparser" ,python-dateparser) ("python-keyring" ,python-keyring) ("python-lxml" ,python-lxml) @@ -11961,7 +12123,8 @@ integrated profiler via Sysprof, debugging support, and more.") ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-requests" ,python-requests) - ("python-unidecode" ,python-unidecode))) + ("python-unidecode" ,python-unidecode) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) @@ -12037,7 +12200,7 @@ developed with the aim of being used with the Librem 5 phone.") ("glib:bin" ,glib "bin") ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config)