me/guix
Archived
1
0
Fork 0
Code Activity

gnu: deja-dup: Update to 43.4.

Browse source 
Fixes <https://issues.guix.gnu.org/55544>.

* gnu/packages/gnome.scm (deja-dup): Update to 43.4.
[phases]{patch-paths}: Adjust Duplicityinstance.vala path.
{skip-gtk-update-icon-cache}: Delete phase.
[inputs]: Replace gtk+ with gtk.  Add libadwaita.  Replace libsoup-minimal-2
with libsoup.
[native-inputs]: Add gtk:bin.

Reported-by: Michael Terry <mike@mterry.name>
This commit is contained in:
Maxim Cournoyer 2022-07-12 22:45:55 -04:00
parent 3f814d1878
commit cabfbcf6e0
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/gnome.scm
View file

@ -1766,14 +1766,14 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
(define-public deja-dup (define-public deja-dup
(package (package
(name "deja-dup") (name "deja-dup")
(version "42.8") (version "43.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/" (uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/"
version "/deja-dup-" version ".tar.bz2")) version "/deja-dup-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0d1jnlxpk52x56aqxz1g2xb4y4sm24h08p2di8mc1k8n8b52rpi4")))) "1mr2g009w0zm5rj8dg1k77c7zdwylih2yszm8vh8wkw6al6bzfh3"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -1787,7 +1787,7 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((python (assoc-ref inputs "python"))) (let ((python (assoc-ref inputs "python")))
(substitute* '("libdeja/tools/duplicity/DuplicityInstance.vala" (substitute* '("libdeja/duplicity/DuplicityInstance.vala"
"libdeja/tests/scripts/instance-error.test") "libdeja/tests/scripts/instance-error.test")
(("/bin/rm") (("/bin/rm")
(which "rm"))) (which "rm")))
@ -1802,14 +1802,7 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
(let ((libgpg-error (assoc-ref inputs "libgpg-error"))) (let ((libgpg-error (assoc-ref inputs "libgpg-error")))
(substitute* "meson.build" (substitute* "meson.build"
(("(gpgerror_libs = ).*" _ var) (("(gpgerror_libs = ).*" _ var)
(format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))) (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error))))))
#t))
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "data/post-install.sh"
(("gtk-update-icon-cache") "true"))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Add duplicity to the search path ;; Add duplicity to the search path
@ -1821,12 +1814,13 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
`(("bash-minimal" ,bash-minimal) `(("bash-minimal" ,bash-minimal)
("duplicity" ,duplicity) ("duplicity" ,duplicity)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+) ("gtk" ,gtk)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
("libadwaita" ,libadwaita)
("libgpg-error" ,libgpg-error) ("libgpg-error" ,libgpg-error)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libsecret" ,libsecret) ("libsecret" ,libsecret)
("libsoup" ,libsoup-minimal-2) ("libsoup" ,libsoup)
("libhandy" ,libhandy) ("libhandy" ,libhandy)
("packagekit" ,packagekit) ("packagekit" ,packagekit)
("python" ,python) ("python" ,python)
@ -1835,8 +1829,9 @@ configuration files for the GNOME menu, as well as a simple menu editor.")
`(("appstream-glib" ,appstream-glib) `(("appstream-glib" ,appstream-glib)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("glib" ,glib "bin") ; for glib-compile-schemas. ("glib" ,glib "bin") ;for glib-compile-schemas
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("gtk" ,gtk "bin") ;for gtk-update-icon-cache
("itstool" ,itstool) ("itstool" ,itstool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("vala" ,vala))) ("vala" ,vala)))