[PATCH 2/4] gnu: dconf: Add dconf.

[PATCH 2/4] gnu: dconf: Add dconf.

[Federico Beffa]

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

A patch for dconf.

Regards,
Fede

[-- Attachment #2: 0002-gnu-dconf-Add-dconf.patch --]
[-- Type: text/x-patch, Size: 2980 bytes --]

From 8ad9f58221983d618816e9be85c39a1176327758 Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Thu, 18 Dec 2014 21:23:52 +0100
Subject: [PATCH 2/4] gnu: dconf: Add dconf.

* gnu/packages/gnome.scm (dconf): New variable.
---
 gnu/packages/gnome.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5d84f4e..a052be1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1324,3 +1324,56 @@ language features to GNOME developers without imposing any additional runtime
 requirements and without using a different ABI compared to applications and
 libraries written in C.")
     (license license:lgpl2.1+)))
+
+(define-public dconf
+  (package
+    (name "dconf")
+    (version "0.22.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://gnome/sources/" name "/" 
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32 "13jb49504bir814v8n8vjip5sazwfwsrnniw87cpg7phqfq7q9qa"))))
+    (build-system glib-or-gtk-build-system)
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("glib" ,glib)
+       ("dbus" ,dbus)
+       ("libxml2" ,libxml2)))
+    (native-inputs
+     `(("libxslt" ,libxslt)
+       ("docbook-xml" ,docbook-xml-4.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (arguments
+     `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id
+                   ; or /etc/machine-id.
+       #:configure-flags
+       ;; Set the correct RUNPATH in binaries.
+       (list (string-append "LDFLAGS=-Wl,-rpath=" 
+                            (assoc-ref %outputs "out") "/lib")
+             "--disable-gtk-doc-html") ; FIXME: requires gtk-doc
+       #:phases
+       (alist-cons-before
+        'configure 'fix-docbook
+        (lambda* (#:key inputs #:allow-other-keys)
+          (substitute* "docs/Makefile.in"
+            (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
+             (string-append (assoc-ref inputs "docbook-xsl") 
+                            "/xml/xsl/docbook-xsl-"
+                            ,(package-version docbook-xsl)
+                            "/manpages/docbook.xsl")))
+          (setenv "XML_CATALOG_FILES" 
+                  (string-append (assoc-ref inputs "docbook-xml") 
+                                 "/xml/dtd/docbook/catalog.xml")))
+        %standard-phases)))
+    (home-page "https://developer.gnome.org/dconf")
+    (synopsis "Low-level GNOME configuration system")
+    (description "Dconf is a low-level configuration system.  Its main purpose
+is to provide a backend to GSettings on platforms that don't already have
+configuration storage systems.")
+    (license license:lgpl2.1)))
-- 
1.8.4

Re: [PATCH 2/4] gnu: dconf: Add dconf.

[Ludovic Courtès]

Federico Beffa <beffa@ieee.org> skribis:

> From 8ad9f58221983d618816e9be85c39a1176327758 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Thu, 18 Dec 2014 21:23:52 +0100
> Subject: [PATCH 2/4] gnu: dconf: Add dconf.
>
> * gnu/packages/gnome.scm (dconf): New variable.

[...]

> +    (arguments
> +     `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id
> +                   ; or /etc/machine-id.

I suspect you may be able to work around it with:

  (setenv "DBUS_FATAL_WARNINGS" "0")

Could you try?

Ludo’.

Re: [PATCH 2/4] gnu: dconf: Add dconf.

[Federico Beffa]

On Sun, Dec 21, 2014 at 12:04 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>> +    (arguments
>> +     `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id
>> +                   ; or /etc/machine-id.
>
> I suspect you may be able to work around it with:
>
>   (setenv "DBUS_FATAL_WARNINGS" "0")
>
> Could you try?

The test still fails because it checks if dconf can communicate with dbus

...
PASS: gvdb
TEST: gdbus-thread... (pid=2901)
  /gdbus/thread/creation/error:                                        OK
  /gdbus/thread/sync-call/success:                                     **
ERROR:../../dconf-0.22.0/tests/dbus.c:237:test_sync_call_success:
assertion failed (error == NULL): Cannot spawn a message bus without a
machine-id: Unable to load /var/lib/dbus/machine-id or
/etc/machine-id: Failed to open file '/var/lib/dbus/machine-id': No
such file or directory (g-file-error-quark, 4)
FAIL
GTester: last random seed: R02S154607e630e87d22c1dc960c6cb5d46f
/gnu/store/qx011cng51s58ggy4xc5iy2yc1965c3x-bash-4.3.30/bin/bash: line
1:  2890 Terminated              G_DEBUG=gc-friendly MALLOC_CHECK_=2
MALLOC_PERTURB_=$((${RANDOM:-256} % 256)) gtester --verbose paths
changeset shm gvdb gdbus-thread gdbus-filter libdbus-1 engine client
Makefile:985: recipe for target 'test-nonrecursive' failed
make[2]: *** [test-nonrecursive] Error 143
make[2]: Leaving directory '/tmp/nix-build-dconf-0.22.0.drv-0/build/tests'
Makefile:853: recipe for target 'check-am' failed
make[1]: *** [check-am] Error 2
make[1]: Leaving directory '/tmp/nix-build-dconf-0.22.0.drv-0/build/tests'
Makefile:418: recipe for target 'check-recursive' failed
make: *** [check-recursive] Error 1
phase `check' failed after 4 seconds
builder for `/gnu/store/k5llpbn43xdhjqp61pi163lygldkhm4k-dconf-0.22.0.drv'
failed with exit code 1
@ build-failed /gnu/store/k5llpbn43xdhjqp61pi163lygldkhm4k-dconf-0.22.0.drv
- 1 builder for
`/gnu/store/k5llpbn43xdhjqp61pi163lygldkhm4k-dconf-0.22.0.drv' failed
with exit code 1
killing process 17204
guix build: error: build failed: build of
`/gnu/store/k5llpbn43xdhjqp61pi163lygldkhm4k-dconf-0.22.0.drv' failed

Regards,
Fede

Re: [PATCH 2/4] gnu: dconf: Add dconf.

[Ludovic Courtès]

Federico Beffa <beffa@ieee.org> skribis:

> On Sun, Dec 21, 2014 at 12:04 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>>> +    (arguments
>>> +     `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id
>>> +                   ; or /etc/machine-id.
>>
>> I suspect you may be able to work around it with:
>>
>>   (setenv "DBUS_FATAL_WARNINGS" "0")
>>
>> Could you try?
>
> The test still fails because it checks if dconf can communicate with dbus

OK.  In that case, please push the patch after updating the above
comment.

Thanks!

Ludo’.