From 77b42f2623ca37bf0f452fd9eaa9c7e9ba01cf8e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 27 Jul 2020 10:45:27 -0400 Subject: [PATCH 53/54] gnu: rest: Update package definition. * gnu/packages/gnome.scm (rest): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:tests?>: Remove argument. <#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, gsettings-desktop-schemas and gtk-doc. Remove glib:bin. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gnome.scm | 66 +++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5646a09e14..ebe3b2ded5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5018,34 +5018,60 @@ proxy information from the GSettings schemas in gsettings-desktop-schemas.") (package (name "rest") (version "0.8.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/rest/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1j81bgqmd55s5lxyaxcplym9n6xywcs1cm9wmvafsg2xiv9sl4q5")))) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/rest/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1j81bgqmd55s5lxyaxcplym9n6xywcs1cm9wmvafsg2xiv9sl4q5")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments - '(#:tests? #f ; tests require internet connection - #:configure-flags - '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"))) + `(#:configure-flags + (list + "--enable-gtk-doc" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference/rest" + (substitute* "rest-docs.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 'disable-failing-tests + (lambda _ + (substitute* "tests/Makefile.in" + (("oauth\\$\\(EXEEXT\\) oauth-async\\$\\(EXEEXT\\) oauth2\\$\\(EXEEXT\\)") + "") + (("flickr\\$\\(EXEEXT\\) lastfm\\$\\(EXEEXT\\) xml\\$\\(EXEEXT\\)") + "") + (("XFAIL_TESTS = xml\\$\\(EXEEXT\\)") + "XFAIL_TESTS =")) + #t))))) (native-inputs - `(("glib-mkenums" ,glib "bin") + `(("docbook-xml" ,docbook-xml-4.1.2) ("gobject-introspection" ,gobject-introspection) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (propagated-inputs - ;; rest-0.7.pc refers to all these. - `(("glib" ,glib) + `(("glib" ,glib) ("libsoup" ,libsoup) ("libxml2" ,libxml2))) - (home-page "https://www.gtk.org/") - (synopsis "RESTful web api query library") - (description - "This library was designed to make it easier to access web services that -claim to be \"RESTful\". It includes convenience wrappers for libsoup and + (synopsis "Library for Representational State Transfer") + (description "LibREST was designed to make it easier to access web services +that claim to be RESTful. It includes convenience wrappers for libsoup and libxml to ease remote use of the RESTful API.") + (home-page "https://gitlab.gnome.org/GNOME/librest") (license license:lgpl2.1+))) (define-public libsoup -- 2.27.0