From c6875dc0d722d07c7906f8103f5ec01649d030e5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 23 Jul 2020 11:19:25 -0400 Subject: [PATCH 20/36] gnu: gnome-online-accounts: Update package definition. * gnu/packages/gnome.scm (gnome-online-accounts): Update package definition. [outputs]: New output 'doc'. [arguments]<#:configure-flags>[--disable-static]: New flag. [--enable-documentation]: New flag. [--enable-gtk-doc]: New flag. [--enable-inspector]: New flag. [--enable-media-server]: New flag. [--enable-lastfm]: New flag. [--with-html-dir=]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl and gtk-doc. Remove glib:bin. [inputs]: Remove docbook-xsl. Add dbus, gcr, mit-krb5, libsoup and libxml2. [propagated-inputs]: Add glib-networking. [description]: Modify. --- gnu/packages/gnome.scm | 70 +++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 62f9ea8306..7bb63516e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7416,24 +7416,46 @@ window manager.") (package (name "gnome-online-accounts") (version "3.36.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0bigfi225g1prnxpb9lcc1i7mdcrkplwb05vilc43jik12cn53qw")))) - (outputs '("out" "lib")) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0bigfi225g1prnxpb9lcc1i7mdcrkplwb05vilc43jik12cn53qw")))) (build-system glib-or-gtk-build-system) + (outputs '("out" "lib" "doc")) (arguments `(#:configure-flags - (list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib")) + (list + (string-append "--libdir=" + (assoc-ref %outputs "out") + "/lib") + "--disable-static" + "--enable-documentation" + "--enable-gtk-doc" + "--enable-inspector" + "--enable-media-server" + "--enable-lastfm" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* '("goa-daemon.xml" + "goa-docs.xml" "goa-overview.xml") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'configure 'patch-libgoa-output (lambda* (#:key outputs #:allow-other-keys) - (let ((lib (assoc-ref outputs "lib"))) + (let* ((lib (assoc-ref outputs "lib"))) (substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in") (("@prefix@") lib) (("@exec_prefix@") lib) @@ -7445,28 +7467,34 @@ window manager.") (setenv "outputs" "out lib") #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("vala" ,vala) ("xsltproc" ,libxslt))) - (propagated-inputs - `(("glib" ,glib) ; required by goa-1.0.pc - ("gtk+" ,gtk+))) ; required by goa-backend-1.0.pc (inputs - `(("docbook-xsl" ,docbook-xsl) + `(("dbus" ,dbus) + ("gcr" ,gcr) ("json-glib" ,json-glib) + ("krb5" ,mit-krb5) ("libsecret" ,libsecret) + ("libsoup" ,libsoup) + ("libxml2" ,libxml2) ("rest" ,rest) ("webkitgtk" ,webkitgtk))) + (propagated-inputs + `(("glib" ,glib) + ("glib-networking" ,glib-networking) + ("gtk+" ,gtk+))) (synopsis "Single sign-on framework for GNOME") + (description "GNOME Online Accounts aims to provide a way for users to setup +online accounts to be used by the core system and core applications only. +Calendar entries show up in GNOME Shell, e-mail in Evolution, online storages +are exposed as GVolumes, and so on.") (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts") - (description - "GNOME Online Accounts provides interfaces so that applications and -libraries in GNOME can access the user's online accounts. It has providers for -Google, ownCloud, Facebook, Flickr, Windows Live, Pocket, Foursquare, Microsoft -Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (license license:lgpl2.0+))) (define-public evolution-data-server -- 2.27.0