[PATCH 4/6] gnu: gnome-documents

[PATCH 4/6] gnu: gnome-documents

[rennes]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

Hi,

I attached uhttpmock patch.

This is the map of non-packaged programs required for gnome-documents:

  1) libzapojit
  2) tracker
  5) libgdata
      3) liboauth
      4) uhttpmock
  6) gnome-documents

Note:
I use "glib-networking" and "gsettings-desktop-schemas" for check phase.


Thanks

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-uhttpmock.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-uhttpmock.patch, Size: 2432 bytes --]

From 8ae39f33c0e10c53c21886bf7cf55c47dbc28214 Mon Sep 17 00:00:00 2001
From: Rene Saavedra <rennes@openmailbox.org>
Date: Sun, 28 Feb 2016 21:57:17 -0600
Subject: [PATCH] gnu: Add uhttpmock.

---
 gnu/packages/uhttpmock.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 gnu/packages/uhttpmock.scm

diff --git a/gnu/packages/uhttpmock.scm b/gnu/packages/uhttpmock.scm
new file mode 100644
index 0000000..65c163e
--- /dev/null
+++ b/gnu/packages/uhttpmock.scm
@@ -0,0 +1,48 @@
+(define-module (gnu packages uhttpmock)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system glib-or-gtk)  
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages pkg-config))
+
+(define-public uhttpmock
+  (package
+    (name "uhttpmock")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0vniyx341pnnmvxmqacc49k0g7h9a9nhknfslidrqmxj5lm1ini6"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:configure-flags
+       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'use-empty-ssl-cert-file
+                     (lambda _
+                       ; Search for ca-certificates.crt files
+                       ; during the check phase.
+                       (setenv "SSL_CERT_FILE" "/dev/null")
+                       #t)))))
+    (native-inputs
+     `(("gobject-introspection" ,gobject-introspection)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib-networking" ,glib-networking)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("libsoup" ,libsoup)))
+    (home-page "https://gitlab.com/groups/uhttpmock")
+    (synopsis "Library for mocking web service APIs which use HTTP or HTTPS")
+    (description
+     "Uhttpmock is a project for mocking web service APIs which use HTTP or
+HTTPS.  It provides a library, libuhttpmock, which implements recording and
+playback of HTTP request/response traces.")
+    (license license:lgpl2.1+)))
-- 
2.6.3

Re: [PATCH 4/6] gnu: gnome-documents

[Ludovic Courtès]

rennes@openmailbox.org skribis:

> +     `(#:configure-flags
> +       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")

AFAICS glib-networking uses GnuTLS, for which we already had such a
setting (except that it can read all the .crt files from /etc/ssl/certs,
not just one bundle.)

> +       (modify-phases %standard-phases
> +         (add-before 'check 'use-empty-ssl-cert-file
> +                     (lambda _
> +                       ; Search for ca-certificates.crt files
> +                       ; during the check phase.
> +                       (setenv "SSL_CERT_FILE" "/dev/null")

Does this really have an effect?  This is the environment variable used
by OpenSSL, but not GnuTLS.

Otherwise LGTM.

Thanks,
Ludo’.

Re: [PATCH 4/6] gnu: gnome-documents

[rennes]

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

On 2016-03-29 14:25, ludo@gnu.org wrote:
> rennes@openmailbox.org skribis:
> 
>> +     `(#:configure-flags
>> +       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
> 
> AFAICS glib-networking uses GnuTLS, for which we already had such a
> setting (except that it can read all the .crt files from 
> /etc/ssl/certs,
> not just one bundle.)

I did more tests and remove this part.

>> +       (modify-phases %standard-phases
>> +         (add-before 'check 'use-empty-ssl-cert-file
>> +                     (lambda _
>> +                       ; Search for ca-certificates.crt files
>> +                       ; during the check phase.
>> +                       (setenv "SSL_CERT_FILE" "/dev/null")
> 
> Does this really have an effect?  This is the environment variable used
> by OpenSSL, but not GnuTLS.

indeed, it works.

Question, to which package module I can add the patch?

Thanks

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-uhttpmock.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-uhttpmock.patch, Size: 3212 bytes --]

From d9abadd86ca67bfae8a7563f8c29ef97f6fbc54a Mon Sep 17 00:00:00 2001
From: Rene Saavedra <rennes@openmailbox.org>
Date: Thu, 14 Apr 2016 09:52:51 -0500
Subject: [PATCH] gnu: Add uhttpmock.

* gnu/packages/uhttpmock.scm (uhttpmock): New file.

---
 gnu/packages/uhttpmock.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 gnu/packages/uhttpmock.scm

diff --git a/gnu/packages/uhttpmock.scm b/gnu/packages/uhttpmock.scm
new file mode 100644
index 0000000..550453e
--- /dev/null
+++ b/gnu/packages/uhttpmock.scm
@@ -0,0 +1,65 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages uhttpmock)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system glib-or-gtk)  
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages pkg-config))
+
+(define-public uhttpmock
+  (package
+    (name "uhttpmock")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0vniyx341pnnmvxmqacc49k0g7h9a9nhknfslidrqmxj5lm1ini6"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'use-empty-ssl-cert-file
+           (lambda _
+             ;; Search for ca-certificates.crt files
+             ;; during the check phase.
+             (setenv "SSL_CERT_FILE" "/dev/null")
+             #t)))))
+    (native-inputs
+     `(("glib-networking" ,glib-networking) ;; For check phase.
+       ("gobject-introspection" ,gobject-introspection)
+       ;; For check phase.
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libsoup" ,libsoup)))
+    (home-page "https://gitlab.com/groups/uhttpmock")
+    (synopsis "Library for mocking web service APIs which use HTTP or HTTPS")
+    (description
+     "Uhttpmock is a project for mocking web service APIs which use HTTP or
+HTTPS.  It provides a library, libuhttpmock, which implements recording and
+playback of HTTP request/response traces.")
+    (license license:lgpl2.1+)))
-- 
2.6.3

Re: [PATCH 4/6] gnu: gnome-documents

[Leo Famulari]

On Thu, Apr 14, 2016 at 10:35:00AM -0500, rennes@openmailbox.org wrote:
> On 2016-03-29 14:25, ludo@gnu.org wrote:
> >rennes@openmailbox.org skribis:
> >
> >>+     `(#:configure-flags
> >>+       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
> >
> >AFAICS glib-networking uses GnuTLS, for which we already had such a
> >setting (except that it can read all the .crt files from /etc/ssl/certs,
> >not just one bundle.)
> 
> I did more tests and remove this part.
> 
> >>+       (modify-phases %standard-phases
> >>+         (add-before 'check 'use-empty-ssl-cert-file
> >>+                     (lambda _
> >>+                       ; Search for ca-certificates.crt files
> >>+                       ; during the check phase.
> >>+                       (setenv "SSL_CERT_FILE" "/dev/null")
> >
> >Does this really have an effect?  This is the environment variable used
> >by OpenSSL, but not GnuTLS.
> 
> indeed, it works.
> 
> Question, to which package module I can add the patch?

I've moved it into web.scm, in the attached revision on your patch. I
can apply it if you think it looks good. What do you think?

I also reorganized the native-inputs a little bit, to put all the
"check" dependencies together.

By the way, thanks for working on this patch series, and SORRY for the
slow review!

Re: [PATCH 4/6] gnu: gnome-documents

[rennes]

On 2016-04-18 13:44, Leo Famulari wrote:
> On Thu, Apr 14, 2016 at 10:35:00AM -0500, rennes@openmailbox.org wrote:
>> On 2016-03-29 14:25, ludo@gnu.org wrote:
>> >rennes@openmailbox.org skribis:
>> >
>> >>+     `(#:configure-flags
>> >>+       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
>> >
>> >AFAICS glib-networking uses GnuTLS, for which we already had such a
>> >setting (except that it can read all the .crt files from /etc/ssl/certs,
>> >not just one bundle.)
>> 
>> I did more tests and remove this part.
>> 
>> >>+       (modify-phases %standard-phases
>> >>+         (add-before 'check 'use-empty-ssl-cert-file
>> >>+                     (lambda _
>> >>+                       ; Search for ca-certificates.crt files
>> >>+                       ; during the check phase.
>> >>+                       (setenv "SSL_CERT_FILE" "/dev/null")
>> >
>> >Does this really have an effect?  This is the environment variable used
>> >by OpenSSL, but not GnuTLS.
>> 
>> indeed, it works.
>> 
>> Question, to which package module I can add the patch?
> 
> I've moved it into web.scm, in the attached revision on your patch. I
> can apply it if you think it looks good. What do you think?
> 
> I also reorganized the native-inputs a little bit, to put all the
> "check" dependencies together.
> 
> By the way, thanks for working on this patch series, and SORRY for the
> slow review!

Hi, I think it's okay.

Thanks

Re: [PATCH 4/6] gnu: gnome-documents

[Leo Famulari]

On Wed, Apr 20, 2016 at 08:26:47AM -0500, rennes@openmailbox.org wrote:
> On 2016-04-18 13:44, Leo Famulari wrote:
> >On Thu, Apr 14, 2016 at 10:35:00AM -0500, rennes@openmailbox.org wrote:
> >>On 2016-03-29 14:25, ludo@gnu.org wrote:
> >>>rennes@openmailbox.org skribis:
> >>>
> >>>>+     `(#:configure-flags
> >>>>+       '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
> >>>
> >>>AFAICS glib-networking uses GnuTLS, for which we already had such a
> >>>setting (except that it can read all the .crt files from /etc/ssl/certs,
> >>>not just one bundle.)
> >>
> >>I did more tests and remove this part.
> >>
> >>>>+       (modify-phases %standard-phases
> >>>>+         (add-before 'check 'use-empty-ssl-cert-file
> >>>>+                     (lambda _
> >>>>+                       ; Search for ca-certificates.crt files
> >>>>+                       ; during the check phase.
> >>>>+                       (setenv "SSL_CERT_FILE" "/dev/null")
> >>>
> >>>Does this really have an effect?  This is the environment variable used
> >>>by OpenSSL, but not GnuTLS.
> >>
> >>indeed, it works.
> >>
> >>Question, to which package module I can add the patch?
> >
> >I've moved it into web.scm, in the attached revision on your patch. I
> >can apply it if you think it looks good. What do you think?
> >
> >I also reorganized the native-inputs a little bit, to put all the
> >"check" dependencies together.
> >
> >By the way, thanks for working on this patch series, and SORRY for the
> >slow review!
> 
> Hi, I think it's okay.

Applied as 7ffbbea00d0!

> 
> Thanks