Archived
1
0
Fork 0

gnu: gnome-online-accounts: Update to 3.44.0 and delete input labels.

* gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.44.0.
[arguments]: Use gexps.
[native-inputs]: Delete labels.  Replace intltool with gettext-minimal.
[inputs]: Delete labels.
This commit is contained in:
Maxim Cournoyer 2022-08-22 23:38:27 -04:00
parent 6852a791b6
commit d4bd9ba2d0
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -7712,7 +7712,7 @@ window manager.")
(define-public gnome-online-accounts (define-public gnome-online-accounts
(package (package
(name "gnome-online-accounts") (name "gnome-online-accounts")
(version "3.43.1") (version "3.44.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -7720,44 +7720,45 @@ window manager.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1s5pmy3hx6hhnyi40r7b773py9kn2qbkxnpxv6149z9fl5ikdjrv")))) "0hkkxa3zqyl0i4kw1p3ak4alwxw4wydh9al6fzwbcdgl0r0ms79q"))))
(outputs '("out" "lib")) (outputs '("out" "lib"))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:configure-flags (list
(list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib")) #:configure-flags
#:phases #~(list (string-append "--libdir=" #$output "/lib"))
(modify-phases %standard-phases #:phases
(add-before 'configure 'patch-libgoa-output #~(modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-before 'configure 'patch-libgoa-output
(let ((lib (assoc-ref outputs "lib"))) (lambda _
(substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in") (let ((lib #$output:lib))
(("@prefix@") lib) (substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in")
(("@exec_prefix@") lib) (("@prefix@") lib)
(("@libdir@") (string-append lib "/lib")) (("@exec_prefix@") lib)
(("@includedir@") (string-append lib "/include")) (("@libdir@") (string-append lib "/lib"))
(("@datadir@") (string-append lib "/share"))) (("@includedir@") (string-append lib "/include"))
;; Make sure gobject-introspection knows about the output (("@datadir@") (string-append lib "/share")))
;; too (see <https://bugs.gnu.org/36535>). ;; Make sure gobject-introspection knows about the output
(setenv "outputs" "out lib"))))))) ;; too (see <https://bugs.gnu.org/36535>).
(setenv "outputs" "out lib")))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. (list `(,glib "bin") ; for glib-compile-schemas, etc.
("gobject-introspection" ,gobject-introspection) gobject-introspection
("intltool" ,intltool) gettext-minimal
("pkg-config" ,pkg-config) pkg-config
("vala" ,vala) vala
("xsltproc" ,libxslt))) libxslt))
(propagated-inputs (propagated-inputs
(list glib ; required by goa-1.0.pc (list glib ; required by goa-1.0.pc
gtk+)) ; required by goa-backend-1.0.pc gtk+)) ; required by goa-backend-1.0.pc
(inputs (inputs
`(("docbook-xsl" ,docbook-xsl) (list docbook-xsl
("json-glib" ,json-glib) json-glib
("libsecret" ,libsecret) libsecret
("rest" ,rest) rest
;; WebKitGtk propagates libsoup 3, which causes the build to fail; so ;; WebKitGtk propagates libsoup 3, which causes the build to fail; so
;; use a special variant. ;; use a special variant.
("webkitgtk" ,webkitgtk-with-libsoup2))) webkitgtk-with-libsoup2))
(synopsis "Single sign-on framework for GNOME") (synopsis "Single sign-on framework for GNOME")
(home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts") (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts")
(description (description